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

Sync CHANGES for r1893111. [skip ci]

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

diff --git a/CHANGES b/CHANGES
index 988df145ab1..a52c2e7317d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.49
 
+  *) mod_proxy: Do not canonicalize the proxied URL when both "nocanon" and
+     "ProxyPassInterpolateEnv On" are configured.  PR 65549.
+     [Joel Self <joelself gmail.com>]
+
   *) mpm_event: Fix children processes possibly not stopped on graceful
      restart.  PR 63169.  [Joel Self <joelself gmail.com>]
 
diff --git a/changes-entries/proxy_nocanon_interpolate.txt b/changes-entries/proxy_nocanon_interpolate.txt
deleted file mode 100644
index a2b033cbbf0..00000000000
--- a/changes-entries/proxy_nocanon_interpolate.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_proxy: Do not canonicalize the proxied URL when both "nocanon" and
-     "ProxyPassInterpolateEnv On" are configured.  PR 65549.
-     [Joel Self <joelself gmail.com>]
\ No newline at end of file