diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2015-10-31 22:57:00 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2015-10-31 23:01:56 +0100 |
| commit | 36b5196d9f57f635c2af5c0474162ab606db9c19 (patch) | |
| tree | 3ef3540f84329c91e684e0ef71087ecb85a31736 | |
| parent | d578473a7658a60f50706745a30663552ffb2df8 (diff) | |
| download | apache2-36b5196d9f57f635c2af5c0474162ab606db9c19.tar.gz | |
mod_http2: Log HTTP/2 in access log
Not HTTP/1.1
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/mod_http2_log_protocol.patch | 23 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 5d16e9ea..8759488f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apache2 (2.4.17-2) UNRELEASED; urgency=medium * Revert REDIRECT_URL to pre-2.4.17 behavior for now. The change broke lots of web-apps. Closes: #803353 + * mod_http2: Write HTTP/2 into THE_REQUEST and the access log. -- Stefan Fritsch <sf@debian.org> Sat, 31 Oct 2015 22:51:31 +0100 diff --git a/debian/patches/mod_http2_log_protocol.patch b/debian/patches/mod_http2_log_protocol.patch new file mode 100644 index 00000000..1210c530 --- /dev/null +++ b/debian/patches/mod_http2_log_protocol.patch @@ -0,0 +1,23 @@ +# Put HTTP/2 into THE_REQUEST, affecting the access log +# https://svn.apache.org/r1708319 +--- apache2.orig/modules/http2/h2_task.c ++++ apache2/modules/http2/h2_task.c +@@ -379,8 +379,6 @@ static request_rec *h2_task_create_reque + + /* Time to populate r with the data we have. */ + r->request_time = apr_time_now(); +- r->the_request = apr_psprintf(r->pool, "%s %s HTTP/1.1", +- env->method, env->path); + r->method = env->method; + /* Provide quick information about the request method as soon as known */ + r->method_number = ap_method_number_of(r->method); +@@ -391,6 +389,9 @@ static request_rec *h2_task_create_reque + ap_parse_uri(r, env->path); + r->protocol = (char*)"HTTP/2"; + r->proto_num = HTTP_VERSION(2, 0); ++ ++ r->the_request = apr_psprintf(r->pool, "%s %s %s", ++ r->method, env->path, r->protocol); + + /* update what we think the virtual host is based on the headers we've + * now read. may update status. diff --git a/debian/patches/series b/debian/patches/series index 0942c53e..59ac3a54 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ reproducible_builds.diff # This patch is applied manually #suexec-custom.patch revert-REDIRECT_URL.patch +mod_http2_log_protocol.patch |