mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
*) mod_http2: v2.0.15 with the following fixes and improvements
- New directive 'H2EarlyHint name value' to add headers to a response, picked up already when a "103 Early Hints" response is sent. 'name' and 'value' must comply to the HTTP field restrictions. This directive can be repeated several times and header fields of the same names add. Sending a 'Link' header with 'preload' relation will also cause a HTTP/2 PUSH if enabled and supported by the client. - Fixed an issue where requests were not logged and accounted in a timely fashion when the connection returns to "keepalive" handling, e.g. when the request served was the last outstanding one. This led to late appearance in access logs with wrong duration times reported. - Accurately report the bytes sent for a request in the '%O' Log format. This addresses #203, a long outstanding issue where mod_h2 has reported numbers over-eagerly from internal buffering and not what has actually been placed on the connection. The numbers are now the same with and without H2CopyFiles enabled. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1909769 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -304,6 +304,7 @@ static void assign_headers(request_rec *r, const h2_request *req,
|
||||
const char *cl;
|
||||
|
||||
r->headers_in = apr_table_clone(r->pool, req->headers);
|
||||
|
||||
if (req->authority) {
|
||||
/* for internal handling, we have to simulate that :authority
|
||||
* came in as Host:, RFC 9113 ch. says that mismatches between
|
||||
@@ -367,12 +368,15 @@ request_rec *h2_create_request_rec(const h2_request *req, conn_rec *c,
|
||||
/* Time to populate r with the data we have. */
|
||||
r->request_time = req->request_time;
|
||||
AP_DEBUG_ASSERT(req->authority);
|
||||
if (req->scheme && (ap_cstr_casecmp(req->scheme,
|
||||
ap_ssl_conn_is_ssl(c->master? c->master : c)? "https" : "http")
|
||||
|| !ap_cstr_casecmp("CONNECT", req->method))) {
|
||||
/* Client sent a non-matching ':scheme' pseudo header. Forward this
|
||||
* via an absolute URI in the request line.
|
||||
*/
|
||||
if (!apr_strnatcasecmp("CONNECT", req->method)) {
|
||||
/* CONNECT MUST NOT have scheme or path */
|
||||
r->the_request = apr_psprintf(r->pool, "%s %s HTTP/2.0",
|
||||
req->method, req->authority);
|
||||
}
|
||||
else if (req->scheme && ap_cstr_casecmp(req->scheme, "http")
|
||||
&& ap_cstr_casecmp(req->scheme, "https")) {
|
||||
/* Client sent a ':scheme' pseudo header for something else
|
||||
* than what we handle by default. Make an absolute URI. */
|
||||
r->the_request = apr_psprintf(r->pool, "%s %s://%s%s HTTP/2.0",
|
||||
req->method, req->scheme, req->authority,
|
||||
req->path ? req->path : "");
|
||||
@@ -381,11 +385,6 @@ request_rec *h2_create_request_rec(const h2_request *req, conn_rec *c,
|
||||
r->the_request = apr_psprintf(r->pool, "%s %s HTTP/2.0",
|
||||
req->method, req->path);
|
||||
}
|
||||
else if (!apr_strnatcasecmp("CONNECT", req->method)) {
|
||||
/* CONNECT MUST NOT have scheme or path */
|
||||
r->the_request = apr_psprintf(r->pool, "%s %s HTTP/2.0",
|
||||
req->method, req->authority);
|
||||
}
|
||||
else {
|
||||
/* We should only come here on a request that is errored already.
|
||||
* create a request line that passes parsing, we'll die anyway.
|
||||
|
Reference in New Issue
Block a user