From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 7 May 2007 15:37:36 +0000 (+0000)
Subject: * Sync with 2.2.x CHANGES file
X-Git-Tag: 2.3.0~1814
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c5d52c71470e834fb860992cf56cf720279339e;p=apache

* Sync with 2.2.x CHANGES file


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

diff --git a/CHANGES b/CHANGES
index 792b5be3f4..36582fc45a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -83,9 +83,6 @@ Changes with Apache 2.3.0
      only, or else sub-requests and internal redirections may cause
      entire DBD pool to be stashed in a single HTTP request.  [Chris Darroch]
 
-  *) mod_cache: Correctly cache objects whose URL query string has been
-     modified by mod_rewrite. PR 40805. [Ruediger Pluem]
-
   *) mod_proxy: Add a missing assignment in an error checking code path.
      PR 40865. [Andrew Rucker Jones <arjones simultan.dyndns.org>]
 
@@ -265,6 +262,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.5
 
+  *) mod_cache: Correctly cache objects whose URL query string has been
+     modified by mod_rewrite. PR 40805. [Ruediger Pluem]
+
   *) HTTP proxy ProxyErrorOverride: Leave 1xx and 3xx responses alone.  Only
      processing of error responses (4xx, 5xx) will be altered.  PR 39245.
      [Jeff Trawick, Bart van der Schans <schans hippo.nl>]