propose backport h2 [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900579 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 570a528e5064de01a3671ab16902d50fdaa008a5..2ae7e637ff29280193aad5422187913c39bb8240 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -233,56 +233,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patches: svn merge -c 1900340 ^/httpd/httpd/trunk .
      +1: jailletc36,
 
+  *) mod_http2: remove unscheduling of ongoing tasks when client
+     behaviour triggers mood change. Fixes https://github.com/icing/mod_h2/issues/231
+     Trunk version of patch: n.a.
+     2.4.x patch: https://github.com/apache/httpd/pull/317.diff
+     +1: icing
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]
 
-  *) mod_http2: sync with trunk
-     - Fixed an issue since 1.15.24 that "Server" headers in proxied requests
-       were overwritten instead of preserved. [PR by @daum3ns]
-     - Added directove 'H2StreamTimeout' to configure a separate value for HTTP/2
-       streams, overriding server's 'Timeout' configuration. [rpluem]
-     - HTTP/2 connections now use pollsets to monitor the status of the
-       ongoing streams and their main connection when host OS allows this.
-     - Removed work-arounds for older versions of libnghttp2 and checking
-       during configure that at least version 1.15.0 is present.
-     - The HTTP/2 connection state handler, based on an experiment and draft
-       at the IETF http working group (abandoned for some time), has been removed.
-     - H2SerializeHeaders no longer has an effect. A warning is logged when it is
-       set to "on". The switch enabled the internal writing of requests to be parsed
-       by the internal HTTP/1.1 protocol handler and was introduced to avoid
-       potential incompatibilities during the introduction of HTTP/2.
-     - Removed the abort/redo of tasks when mood swings lower the active limit.
-     - a regression in v1.15.24 of the modules was fixed that
-       could lead to httpd child processes not being terminated on a
-       graceful reload or when reaching MaxConnectionsPerChild.
-       When unprocessed h2 requests were queued at the time, these could stall.
-       See <https://github.com/icing/mod_h2/issues/212>.
-     - fix logic for non-proxy Server and Date response headers. [ylavic]
-     - The pollset implemenation is only enabled when APR >= 1.6 is detected.
-     Trunk version of patch:
-        https://svn.apache.org/r1894163
-        https://svn.apache.org/r1894169
-        https://svn.apache.org/r1894172
-        https://svn.apache.org/r1894181
-        https://svn.apache.org/r1894184
-        https://svn.apache.org/r1894189
-        https://svn.apache.org/r1894190
-        https://svn.apache.org/r1894192
-        https://svn.apache.org/r1894220
-        https://svn.apache.org/r1894226
-        https://svn.apache.org/r1894228
-        https://svn.apache.org/r1894241
-        https://svn.apache.org/r1894252
-        https://svn.apache.org/r1894728
-        https://svn.apache.org/r1894949
-        https://svn.apache.org/r1895336
-        https://svn.apache.org/r1895349
-        https://svn.apache.org/r1895724
-        https://svn.apache.org/r1895614
-     Backport version for 2.4.x of patch:
-       PR: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/275.diff
-     +1: icing, jim,
-
   *) mod_xml2enc: Correctly handle Microsoft OOXML documents.  PR 64339
      trunk patch: http://svn.apache.org/r1884505
      2.4.x patch: svn merge -c 1884505 ^/httpd/httpd/trunk .