]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
vote and promote. [skip ci]
authorStefan Eissing <icing@apache.org>
Tue, 24 Aug 2021 12:23:34 +0000 (12:23 +0000)
committerStefan Eissing <icing@apache.org>
Tue, 24 Aug 2021 12:23:34 +0000 (12:23 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1892568 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 87cba00756fc03899390d3d5b53ed068ffa909ed..8a545b0454f6b9544059e975863b4c9407fbd142 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -142,6 +142,17 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_proxy: Fix possible reuse/merging of Proxy(Pass)Match worker instances
+     with others when their URLs contain a '$' substitution.  PR 65419 + 65429.
+     trunk patch: http://svn.apache.org/r1891206
+                  http://svn.apache.org/r1891216
+                  http://svn.apache.org/r1891284
+     backport: wget http://people.apache.org/~ylavic/patches/2.4.x-bz_65419+65429-v2.patch
+             + patch -p0 < 2.4.x-bz_65419+65429-v2.patch
+             + svn merge --record-only -c 1891206,1891216,1891284 ^/httpd/httpd/trunk .
+             + make update-changes
+     +1: ylavic, minfrin, icing
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -189,17 +200,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
            PR: https://github.com/apache/httpd/pull/204
      +1: icing, minfrin
 
-  *) mod_proxy: Fix possible reuse/merging of Proxy(Pass)Match worker instances
-     with others when their URLs contain a '$' substitution.  PR 65419 + 65429.
-     trunk patch: http://svn.apache.org/r1891206
-                  http://svn.apache.org/r1891216
-                  http://svn.apache.org/r1891284
-     backport: wget http://people.apache.org/~ylavic/patches/2.4.x-bz_65419+65429-v2.patch
-             + patch -p0 < 2.4.x-bz_65419+65429-v2.patch
-             + svn merge --record-only -c 1891206,1891216,1891284 ^/httpd/httpd/trunk .
-             + make update-changes
-     +1: ylavic, minfrin
-
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]