This patch as been merged into 2.0.46

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

diff --git a/CHANGES b/CHANGES
index 0215f8632bcfccfba110266493c7081c14edbc24..e417655f30cbf9b6fcb8e9155fcad62c84135121 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -146,11 +146,6 @@ Changes with Apache 2.1.0-dev
      which allows to influence the negotiation process on request basis
      to prefer a certain language.  [André Malo]
 
-  *) Added AllowEncodedSlashes directive which permits request URIs
-     to encode '/' as '%2f' and pass it to scripts in path-info without
-     triggering the 'no encoded slashes anywhere' legacy rule.
-     PR 543, 2389, 3581, 3589, 5687, 7066, 7865, 14639.  [Ken Coar]
-
   *) Move RFC 1413 ident requests from core to new module mod_ident.
      [André Malo]
 
@@ -187,6 +182,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) Added AllowEncodedSlashes directive to permit control of whether
+     the server will accept encoded slashes ('%2f') in the URI path.
+     Default condition is off (the historical behaviour).  This permits
+     environments in which the path-info needs to contain encoded
+     slashes. PR 543, 2389, 3581, 3589, 5687, 7066, 7865, 14639.  [Ken Coar]
+
   *) When using Redirect in directory context, append requested query
      string if there's no one supplied by configuration. PR 10961.
      [André Malo]