* Sync with 2.2.x CHANGES

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

diff --git a/CHANGES b/CHANGES
index 9851c89b913a1b146f60d64524dc8e57ad1141ac..721bf31cd27d7a7103f92f67a115647210acff4a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -18,16 +18,9 @@ Changes with Apache 2.3.0
   *) Added new connection states for handler and write completion
      [Brian Pane]
 
-  *) mod_proxy_ajp: Do not spool the entire response from AJP backend before
-     sending it up the filter chain. PR37100.  [Ruediger Pluem]
-
   *) Preserve the Content-Length header for a proxied HEAD request.
      PR 18757 [Greg Ames]
 
-  *) mod_cache: Create new filters CACHE_OUT_SUBREQ / CACHE_SAVE_SUBREQ which
-     only differ by the type from CACHE_OUT / CACHE_SAVE to ensure that
-     subrequests to non local resources work again. [Ruediger Pluem]
-
   *) New module: mod_authn_dbd [Nick Kew]
 
   *) mod_cgid: Refuse to work on Solaris 10 due to OS bugs.  PR 34264.
@@ -40,6 +33,13 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.9
 
+  *) mod_proxy_ajp: Do not spool the entire response from AJP backend before
+     sending it up the filter chain. PR37100.  [Ruediger Pluem]
+
+  *) mod_cache: Create new filters CACHE_OUT_SUBREQ / CACHE_SAVE_SUBREQ which
+     only differ by the type from CACHE_OUT / CACHE_SAVE to ensure that
+     subrequests to non local resources work again. [Ruediger Pluem]
+
   *) mod_proxy: Do not lowercase the entire worker name of a BalancerMember
      since this breaks case sensitive URI's. PR36906.  [Ruediger Pluem]