From: Yann Ylavic Date: Tue, 24 Aug 2021 12:45:12 +0000 (+0000) Subject: Backported [skip ci]. X-Git-Tag: candidate-2.4.49~3^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9037680a1d4f8116675355c3d12d53d40e57f33;p=thirdparty%2Fapache%2Fhttpd.git Backported [skip ci]. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1892570 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 8a545b0454f..71bbdf23eb2 100644 --- a/STATUS +++ b/STATUS @@ -142,17 +142,6 @@ 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 ]