From: Jim Jagielski <jim@apache.org>
Date: Mon, 17 Oct 2022 11:19:22 +0000 (+0000)
Subject: Update backport w/ fix noted by CJ!
X-Git-Tag: 2.4.55-rc1-candidate~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed503eef93268ee0cee99a61fd73a9d885baf15e;p=thirdparty%2Fapache%2Fhttpd.git

Update backport w/ fix noted by CJ!


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

diff --git a/STATUS b/STATUS
index af7a3b0e806..ba351c5a92a 100644
--- 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,