From: Jeff Trawick <trawick@apache.org>
Date: Fri, 8 Dec 2006 12:56:35 +0000 (+0000)
Subject: sync with 2.2.x branch
X-Git-Tag: 2.3.0~1987
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f4f52d4a00add07cf98cb5e8e1bc73f88345883;p=thirdparty%2Fapache%2Fhttpd.git

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 6fbc586229f..7576c301067 100644
--- 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]