sync with 2.2.x branch

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

diff --git a/CHANGES b/CHANGES
index 255c9d4956944a3c650bc89af7aa4a612a87a2a5..cb322e0a436492258016200242056405db6f41bb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -76,10 +76,6 @@ Changes with Apache 2.3.0
      and merge function.  Use ap_log_error() wherever possible.
      [Chris Darroch, Nick Kew]
 
-  *) mod_proxy_http: Handle request bodies larger than 2 GB by converting
-     the Content-Length header of the request correctly. PR 40883.
-     [Ruediger Pluem, toadie <toadie643 gmail.com>]
-
   *) core: Do not replace a Date header set by a proxied backend server.
      PR 40232. [Ruediger Pluem]
 
@@ -276,6 +272,13 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.5
 
+  *) core: Correct a regression since 2.0.x in the handling of AllowOverride 
+     Options.  PR 41829.  [Torsten Förtsch <torsten.foertsch gmx.net>]
+
+  *) mod_proxy_http: Handle request bodies larger than 2 GB by converting
+     the Content-Length header of the request correctly. PR 40883.
+     [Ruediger Pluem, toadie <toadie643 gmail.com>]
+
   *) mod_proxy: Fix some proxy setting inheritance problems (eg:
      ProxyTimeout). PR 11540. [Stuart Children <stuart terminus.co.uk>]