]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Add missing commit into 2.4.x-bz_65419+65429-v2.patch [skip ci]
authorYann Ylavic <ylavic@apache.org>
Thu, 22 Jul 2021 21:12:13 +0000 (21:12 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 22 Jul 2021 21:12:13 +0000 (21:12 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1891738 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 5d531bab8c3f2fe7d421c96e68f2b75d28a1e434..da40b4cb6a2b80959a4236760c7648ab9c88deec 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -275,10 +275,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) 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.patch
+     backport: wget http://people.apache.org/~ylavic/patches/2.4.x-bz_65419+65429-v2.patch
              + patch -p0 < 2.4.x-bz_65419+65429.patch
-             + svn merge --record-only -c 1891206,1891284 ^/httpd/httpd/trunk .
+             + svn merge --record-only -c 1891206,1891216,1891284 ^/httpd/httpd/trunk .
              + make update-changes
      +1: ylavic,