From: Paul J. Reder <rederpj@apache.org>
Date: Wed, 4 Feb 2004 15:58:33 +0000 (+0000)
Subject: Re-synch with 2.0 stable branch after backport.
X-Git-Tag: pre_ajp_proxy~736
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5611d7e7d898b955100646a5e60abe4f99b2442;p=apache

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 eb002d9cb3..d05a1f6810 100644
--- 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>]