From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 17 May 2007 21:16:56 +0000 (+0000)
Subject: * Sync with 2.2.x CHANGES file
X-Git-Tag: 2.3.0~1803
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3469f8e1117221aeec0c9c239faeb49ff71262cd;p=apache

* Sync with 2.2.x CHANGES file


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

diff --git a/CHANGES b/CHANGES
index f8e06aa5cb..2291b82633 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,12 +33,6 @@ Changes with Apache 2.3.0
      for SDKs that define LDAP_NO_LIMIT to something other than -1.
      [David Jones <oscaremma gmail.com>]
 
-  *) mod_cache: Use the same cache key throughout the whole request processing
-     to handle escaped URLs correctly.  PR 41475. [Ruediger Pluem]
-
-  *) mod_cache: Add CacheIgnoreQueryString directive.  PR 41484.
-     [Fredrik Widlund <fredrik.widlund qbrick.com>]
-
   *) mod_dbd: Introduce configuration groups to allow inheritance by virtual
      hosts of database configurations from the main server.  Determine the
      minimal set of distinct configurations and share connection pools
@@ -267,6 +261,12 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.5
 
+  *) mod_cache: Use the same cache key throughout the whole request processing
+     to handle escaped URLs correctly.  PR 41475. [Ruediger Pluem]
+
+  *) mod_cache: Add CacheIgnoreQueryString directive.  PR 41484.
+     [Fredrik Widlund <fredrik.widlund qbrick.com>]
+
   *) mod_cache: While serving a cached entity ensure that filters that have
      been applied to this cached entity before saving it to the cache are not
      applied again. PR 40090. [Ruediger Pluem]