You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by yl...@apache.org on 2021/07/22 21:12:13 UTC

svn commit: r1891738 - /httpd/httpd/branches/2.4.x/STATUS

Author: ylavic
Date: Thu Jul 22 21:12:13 2021
New Revision: 1891738

URL: http://svn.apache.org/viewvc?rev=1891738&view=rev
Log:
Add missing commit into 2.4.x-bz_65419+65429-v2.patch [skip ci]

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1891738&r1=1891737&r2=1891738&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Jul 22 21:12:13 2021
@@ -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,