]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Update backport w/ fix noted by CJ!
authorJim Jagielski <jim@apache.org>
Mon, 17 Oct 2022 11:19:22 +0000 (11:19 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 17 Oct 2022 11:19:22 +0000 (11:19 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1904643 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index af7a3b0e8060747e099d85c96da8e09974ba01aa..ba351c5a92a43e8da55f3afc6c36f583877c0966 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -194,11 +194,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk revision:
         https://svn.apache.org/r1903744
         https://svn.apache.org/r1903745
+        https://svn.apache.org/r1904642
      Backport version for 2.4.x of patch:
         svn merge works
      +1: jim,
-     -1: jailletc36: the place of the 'protocol' seems wrong in the GET11 case
-         (see @dev)
 
   *) mod_proxy_hcheck: Detect AJP/CPING support correctly. PR 66300.
      trunk revision:
@@ -218,7 +217,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk revision:
         https://svn.apache.org/r1901772
      2.4.x patch:
-        svn merge -c 1901772 ^/httpd/httpd/trunk . 
+        svn merge -c 1901772 ^/httpd/httpd/trunk .
      +1: rpluem, ylavic,