]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge of r1861338,1862475,1862583,1862865,1863221,1863276 from trunk:
authorStefan Eissing <icing@apache.org>
Thu, 1 Aug 2019 08:18:03 +0000 (08:18 +0000)
committerStefan Eissing <icing@apache.org>
Thu, 1 Aug 2019 08:18:03 +0000 (08:18 +0000)
commita5625cc9d9f139e3ee6208cc5347c552fde0a93f
tree0ebd0e015f15ea78574dbcb83483298ae5db26e6
parent2e8e647814345a380daa55d3e6894ef3529ea6a8
Merge of r1861338,1862475,1862583,1862865,1863221,1863276 from trunk:

  *) mod_http2: core setting "LimitRequestFieldSize" is not additionally checked on
     merged header fields, just as HTTP/1.1 does. [Stefan Eissing, Michael Kaufmann]

  *) mod_http2: fixed a bug that prevented proper stream cleanup when connection
     throttling was in place. Stream resets by clients on streams initiated by them
     are counted as possible trigger for throttling. [Stefan Eissing]

  *) mod_http2/mpm_event: Fixes the behaviour when a HTTP/2 connection has nothing
     more to write with streams ongoing (flow control block). The timeout waiting
     for the client to send WINODW_UPDATE was incorrectly KeepAliveTimeout and not
     Timeout as it should be. Fixes PR 63534. [Yann Ylavic, Stefan Eissing]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1864126 13f79535-47bb-0310-9956-ffa450edef68
13 files changed:
CHANGES
modules/http2/h2_conn.c
modules/http2/h2_filter.c
modules/http2/h2_mplx.c
modules/http2/h2_mplx.h
modules/http2/h2_proxy_session.c
modules/http2/h2_session.c
modules/http2/h2_stream.c
modules/http2/h2_stream.h
modules/http2/h2_task.c
modules/http2/h2_task.h
modules/http2/h2_version.h
server/mpm/event/event.c