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

Re-sych with 2.0 stable branch after backport.


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

diff --git a/CHANGES b/CHANGES
index 3dc91bf2b3..eb002d9cb3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,10 +8,6 @@ Changes with Apache 2.1.0-dev
   *) Delete some make-generated files in the server directory during 
      "make clean" processing.  PR 26552.  [Jeff Trawick]
 
-  *) 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>]
-
   *) Allow mod_auth_digest to work with sub-requests with different
      methods than the original request.  PR 25040.
      [Josh Dady <jpd indecisive.com>]
@@ -275,6 +271,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) 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>]
+
   *) Add support for IMT minor-type wildcards (e.g., text/*) to
      ExpiresByType.  PR#7991  [Ken Coar]