Re-synch with 2.0 stable branch after backport.

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

diff --git a/CHANGES b/CHANGES
index eb002d9cb3b2fc6daf726461a58c899ee0f9c1de..d05a1f6810b829c4df53c673ea191d3977a4d559 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -124,9 +124,6 @@ Changes with Apache 2.1.0-dev
   *) mod_rewrite: Allow forced mimetypes [T=...] to get expanded.
      PR 14223.  [André Malo]
 
-  *) mod_rewrite: Catch an edge case, where strange subsequent RewriteRules
-     could lead to a 400 (Bad Request) response.  [André Malo]
-
   *) mod_rewrite: Fix LA-U and LA-F lookups in directory context. Previously
      the current rewrite state was just used as lookup path, which lead to
      strange and often useless results. Related to PR 8493.  [André Malo]
@@ -271,6 +268,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_rewrite: Catch an edge case, where strange subsequent RewriteRules
+     could lead to a 400 (Bad Request) response.  [André Malo]
+
   *) Keep focus of ITERATE and ITERATE2 on the current module when
      the module chooses to return DECLINE_CMD for the directive.
      PR 22299.  [Geoffrey Young <geoff apache.org>]