sync 2.2.5 changes... bah. See post on dev@httpd regarding

this waste of time :)

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

diff --git a/CHANGES b/CHANGES
index 375410afdcc20763bca6ad044dc156ef5d0ad426..9dbdedf3a83d22927e7a5f8c28a8de4b1dbcd052 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -16,12 +16,6 @@ Changes with Apache 2.3.0
   *) mime.types: add registered Apple installer type
      PR 40379 [Peter Bierman <pmb+apache apple.com>]
    
-  *) mod_proxy: fix buffer overflow issue
-     PR 41144 [Davi Arnaut]
-
-  *) mod_deflate: fix protocol handling in deflate input filter
-     PR 23287 [Nick Kew]
-
   *) mod_ldap, mod_authnzldap: Add support for nested groups (i.e. the ability
      to authorize an authenticated user via a "require ldap-group X" directive
      where the user is not in group X, but is in a subgroup contained in X.
@@ -308,6 +302,12 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.5
 
+  *) mod_deflate: fix protocol handling in deflate input filter
+     PR 23287 [Nick Kew]
+
+  *) mod_proxy: fix buffer overflow issue
+     PR 41144 [Davi Arnaut]
+
   *) mime.types: add Registered Javascript/ECMAScript MIME types (RFC4329)
      PR 40299 [Dave Hodder <dmh dmh.org.uk>]