sync with 2.2.x branch

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

diff --git a/CHANGES b/CHANGES
index 6fbc586229ff580c1a9740433b10732a4aaad526..7576c301067659f1a2a5b25f930de129b65d2c5c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -84,9 +84,6 @@ Changes with Apache 2.3.0
 
   *) mod_headers: support regexp-based editing of HTTP headers [Nick Kew]
 
-  *) mod_cache: Eliminate a bogus error in the log when a filter returns
-     AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]
-
   *) mod_disk_cache: Make caching of large files possible on 32bit machines
      by determining whether the cached file should be copied on disk rather
      than loaded into RAM. PR39380 [Niklas Edmundsson <nikke acc.umu.se>]
@@ -259,6 +256,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.4
 
+  *) mod_cache: Eliminate a bogus error in the log when a filter returns
+     AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]
+
   *) Fix issue which could cause piped loggers to be orphaned and never
      terminate after a graceful restart.  PR 40651.  [Joe Orton,
      Ruediger Pluem]