]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Propose fix for PRs 65419 and 65429. [skip ci]
authorYann Ylavic <ylavic@apache.org>
Thu, 22 Jul 2021 18:16:52 +0000 (18:16 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 22 Jul 2021 18:16:52 +0000 (18:16 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1891732 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index f48f2067025ba436e638d796c89fa77ebbf0e49e..d47c2a6c3d75de4b4824ef5b365d74363ddee550 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -272,6 +272,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              + make update-changes
      +1: ylavic,
 
+  *) 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/r1891284
+     backport: wget http://people.apache.org/~ylavic/patches/2.4.x-bz_65419+65429.patch
+             + patch -p0 < 2.4.x-bz_65419+65429.patch
+             + svn merge --record-only -c 1891206,1891284 ^/httpd/httpd/trunk .
+             + sed -i -e 's/mpm_proxy/mod_proxy/' -e 's/PR 65419/PR 65419 + 65429/' changes-entries/proxy_define_matchable_worker.txt
+             + make update-changes
+     +1: ylavic,
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]