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 988df145ab1a3ec578bbc58671c653bebd5dde2a..a52c2e7317d9555a8e447e7cfda27f3494dd3473 100644 (file)
--- 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 (file)
index a2b033c..0000000
--- 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