]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
update http2 backport proposal
authorStefan Eissing <icing@apache.org>
Wed, 27 Nov 2019 11:22:55 +0000 (11:22 +0000)
committerStefan Eissing <icing@apache.org>
Wed, 27 Nov 2019 11:22:55 +0000 (11:22 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1870500 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index c354dada410698f03ac720f125f1e8d57611f366..6d18a606b2125a031adcab67d581cb75228f9b7d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -261,7 +261,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
 *) mod_http2: Fix mod_reqtimeout interworking on handshakes. Fix H2Directr config value.
      trunk patch: http://svn.apache.org/r1870454
-     2.4.x patch: svn merge -c 1870454 ^/httpd/httpd/trunk .
+                  http://svn.apache.org/r1870499
+     2.4.x patch: svn merge -c 1870454,1870499 ^/httpd/httpd/trunk .
      +1: icing, 
 
 PATCHES/ISSUES THAT ARE BEING WORKED