]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
backport
authorJim Jagielski <jim@apache.org>
Wed, 12 Sep 2018 20:36:00 +0000 (20:36 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 12 Sep 2018 20:36:00 +0000 (20:36 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1840756 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index b7dd3b7eeed3128e04671b1797373eccb7bbdf15..f25134b819e7b9e0fcf3b3039d3cd08ba8e949d4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -123,6 +123,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+   *) mod_http2: connection IO event handling reworked. Instead of reacting on 
+      incoming bytes, the state machine now acts on incoming frames that are 
+      affecting it.
+      trunk: http://svn.apache.org/r1840010
+      2.4.x: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/mod-http2-con-io-events.patch
+      +1: icing, ylavic, jim
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -219,13 +226,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk patch works
       +1: jim, ylavic,
 
-   *) mod_http2: connection IO event handling reworked. Instead of reacting on 
-      incoming bytes, the state machine now acts on incoming frames that are 
-      affecting it.
-      trunk: http://svn.apache.org/r1840010
-      2.4.x: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/mod-http2-con-io-events.patch
-      +1: icing, ylavic, jim
-
    *) mod_proxy_hcheck: Fix issues with interval determination. PR 62318
       trunk patch: http://svn.apache.org/r1838937
       2.4.x patch: trunk patch works