]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Backported in r1893111. [skip ci]
authorYann Ylavic <ylavic@apache.org>
Wed, 8 Sep 2021 08:29:19 +0000 (08:29 +0000)
committerYann Ylavic <ylavic@apache.org>
Wed, 8 Sep 2021 08:29:19 +0000 (08:29 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1893113 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 199387031320c533879bc10f7125fa71d49acb9c..62d16013e0eaa8b3c54825669ddb975c1204b3dd 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -141,12 +141,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) mod_proxy: Don't canonicalize with both nocanon and ProxyPassInterpolateEnv
-     On.  PR 65549.
-     trunk patch: http://svn.apache.org/r1893016
-     2.4.x patch: svn merge -c 1893016 ^/httpd/httpd/trunk .
-     +1: ylavic, covener, rpluem
-
   *) mod_unique_id: Earlier request_time initialization in read_request_line(),
      plus use of an atomic counter to close the race condition.
      trunk patch: http://svn.apache.org/r1893001