Sync CHANGES.

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

diff --git a/CHANGES b/CHANGES
index f4b84dcbdc463609c621098d13d3cf5c92afdd9f..b0e8b117327070191cc1db6823a7a21dbdc5ea3e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.57
 
+  *) mod_proxy: Check before forwarding that a nocanon path has not been
+     rewritten with spaces during processing.  [Yann Ylavic]
+
   *) mod_proxy: In case that AllowEncodedSlashes is set to NoDecode do not
      double encode encoded slashes in the URL sent by the reverse proxy to the
      backend. [Ruediger Pluem]

diff --git a/changes-entries/proxy_check_path.txt b/changes-entries/proxy_check_path.txt
deleted file mode 100644 (file)
index f753e3a..0000000
--- a/changes-entries/proxy_check_path.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-  *) mod_proxy: Check before forwarding that a nocanon path has not been
-     rewritten with spaces during processing.  [Yann Ylavic]
-