]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
updated backport proposal. [skip ci]
authorStefan Eissing <icing@apache.org>
Fri, 18 Feb 2022 09:32:26 +0000 (09:32 +0000)
committerStefan Eissing <icing@apache.org>
Fri, 18 Feb 2022 09:32:26 +0000 (09:32 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1898174 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 1ac72fba7e2747af8025268f28262e8c5e9e2aef..1ac8c2e260465d610c2bcd1dd4c6d6ece2d237d5 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -271,7 +271,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) mod_http2: preserve the port number given in a HTTP/1.1
      request that was Upgraded to HTTP/2. Fixes PR65881.
      trunk patch: http://svn.apache.org/r1898146
-     2.4.x patch: svn merge -c 1898146 ^/httpd/httpd/trunk .
+                  http://svn.apache.org/r1898173
+     2.4.x patch: svn merge -c 1898146,1898173 ^/httpd/httpd/trunk .
      +1: icing
      
   *) mod_http2: sync with trunk