sync with APACHE_2_0_BRANCH

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105197 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index a0e2201f7708d6e16671c5f437a83c200f981842..bf7f22e3db74dda1ecd74293b2a3ba5d3df18f92 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -22,10 +22,6 @@ Changes with Apache 2.1.0-dev
   *) mod_proxy: If a request has a blank body and has a 0 Content-Length
      headers, pass that to the proxy.  [Justin Erenkrantz]
 
-  *) Fix the handling of URIs containing %2F when AllowEncodedSlashes
-     is enabled.  Previously, such urls would still be rejected with
-     404.  [Jeff Trawick, Bill Stoddard]
-
   *) mod_rewrite: Fix query string handling for proxied URLs. PR 14518.
      [michael teitler <michael.teitler cetelem.fr>,
       Jan Kratochvil <rcpt-dev.AT.httpd.apache.org jankratochvil.net>]
@@ -409,6 +405,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.52
 
+  *) Fix the handling of URIs containing %2F when AllowEncodedSlashes
+     is enabled.  Previously, such urls would still be rejected.
+     [Jeff Trawick, Bill Stoddard]
+
   *) mod_mem_cache: Fixed race condition causing segfault because of memory being
      freed twice, or reused after being freed.
      [J. Clar, W. Stoddard, G. Ames]