From: Eric Covener <covener@apache.org>
Date: Sun, 19 Mar 2023 21:29:21 +0000 (+0000)
Subject: vote/promote
X-Git-Tag: 2.4.57-rc1-candidate~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61e2190ead9c13848aa9db041713f3a8af954e47;p=thirdparty%2Fapache%2Fhttpd.git

vote/promote

[skip ci]


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

diff --git a/STATUS b/STATUS
index 0c20bc43f35..5e49b3ef087 100644
--- a/STATUS
+++ b/STATUS
@@ -171,6 +171,16 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       svn merge -c 1907565 ^/httpd/httpd/trunk .
      +1: rpluem, ylavic, covener
 
+  *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
+     to the origin server, when using mapping=encoded|servlet.
+     trunk patch: http://svn.apache.org/r1907972
+                  http://svn.apache.org/r1907976
+                  http://svn.apache.org/r1907977
+                  http://svn.apache.org/r1908257
+     2.4.x patch: svn merge -c 1907972,1907976,1907977,1908257 ^/httpd/httpd/trunk .
+     +1: ylavic, rpluem, covener
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -187,15 +197,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: minfrin, jim,
      jailletc36: r1745033 seems related and should in included
 
-  *) mod_proxy: Fix double encoding of the uri-path of the request forwarded
-     to the origin server, when using mapping=encoded|servlet.
-     trunk patch: http://svn.apache.org/r1907972
-                  http://svn.apache.org/r1907976
-                  http://svn.apache.org/r1907977
-                  http://svn.apache.org/r1908257
-     2.4.x patch: svn merge -c 1907972,1907976,1907977,1908257 ^/httpd/httpd/trunk .
-     +1: ylavic, rpluem
-
   *) core: Add formats %{z} and %{strftime-format} to ErrorLogFormat, and make
      sure that if the format is configured early enough it applies to every log
      line.  PR 62161.