]> granicus.if.org Git - apache/commit
Merge r1826687, r1827166, r1828210, r1828232, r1828687 from trunk:
authorYann Ylavic <ylavic@apache.org>
Tue, 29 May 2018 21:16:29 +0000 (21:16 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 29 May 2018 21:16:29 +0000 (21:16 +0000)
commit75fa15aa475868e13902b3dee0397881e385b1b9
tree757f75aec252a5cac973eb7790a1fef17d9c7e47
parentec6ebeae0bd91399b0dd5b849b2a46aaa056d1d2
Merge r1826687, r1827166, r1828210, r1828232, r1828687 from trunk:

Instrument 'bbout'

mod_http2: use proper ARP defined for formatting apr_off_t

On the trunk:

mod_http2: on level trace2, log any unsuccessful HTTP/2 direct connection upgrade
     with base64 encoding to unify its appearance in possible bug reports.

On the trunk:

* mod_http2: calculate unencrypted connection sniffing base64 only when log level is at required height. [Ruediger Pluem]

On the trunk:

mod_http2: accurate reporting of h2 data input/output per request via mod_logio. Fixes
     an issue where output sizes where counted n-times on reused slave connections. See
     gituhub issue: https://github.com/icing/mod_h2/issues/158

Submitted by: jailletc36, icing, icing, icing, icing
Reviewed by: icing, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1832489 13f79535-47bb-0310-9956-ffa450edef68
17 files changed:
CHANGES
modules/http2/h2.h
modules/http2/h2_conn.c
modules/http2/h2_filter.c
modules/http2/h2_from_h1.c
modules/http2/h2_h2.c
modules/http2/h2_headers.c
modules/http2/h2_headers.h
modules/http2/h2_mplx.c
modules/http2/h2_push.c
modules/http2/h2_request.c
modules/http2/h2_request.h
modules/http2/h2_session.c
modules/http2/h2_stream.c
modules/http2/h2_stream.h
modules/http2/h2_task.c
modules/http2/h2_version.h