From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 8 Sep 2021 08:29:19 +0000 (+0000)
Subject: Backported in r1893111. [skip ci]
X-Git-Tag: candidate-2.4.49-rc1~3^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b97c80c6701097ec534e6a200b9baa49f0e8eb4;p=thirdparty%2Fapache%2Fhttpd.git

Backported in r1893111. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1893113 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 19938703132..62d16013e0e 100644
--- 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