Synching with 2.0 branch after backport.

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

diff --git a/CHANGES b/CHANGES
index 4a63cb01acb395a969acc569e366b2fe8cd5c0ce..9dfd34e8c4e45321cfb8ab7d3a0c309450eadc05 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -69,15 +69,6 @@ Changes with Apache 2.1.0-dev
   *) Log an error when requests for URIs which fail to map to a valid 
      filesystem name are rejected with 403.  [Jeff Trawick]
 
-  *) Fix a couple of AIX xlc_r compiler issues in the code I just
-     committed. [Paul J. Reder]
-
-  *) Modified the cache code to be header-location agnostic. Also
-     fixed a number of other cache code bugs related to PR 15852.
-     Includes a patch submitted by Sushma Rai <rsushma novell.com>.
-     This fixes mod_mem_cache but not mod_disk_cache yet so I'm not
-     closing the PR since that is what they are using. [Paul J. Reder]
-
   *) Switch to APR 1.0 API.
 
   *) Fix mod_include's expression parser to recognize strings correctly
@@ -259,6 +250,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) Modified the cache code to be header-location agnostic. Also
+     fixed a number of other cache code bugs related to PR 15852.
+     Includes a patch submitted by Sushma Rai <rsushma novell.com>.
+     This fixes mod_mem_cache but not mod_disk_cache yet so I'm not
+     closing the PR since that is what they are using. [Paul J. Reder]
+
   *) complain via error_log when mod_include's INCLUDES filter is
      enabled, but the relevant Options flag allowing the filter to run
      for the specific resource wasn't set, so that the filter won't