Sync with 2.2.4

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

diff --git a/CHANGES b/CHANGES
index afd4b49acdfdef63f12af2cf3ce629173baa1254..d777b8675a82d9783a01c0adb56b0a3828068ec6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -81,9 +81,6 @@ Changes with Apache 2.3.0
      by determining whether the cached file should be copied on disk rather
      than loaded into RAM. PR39380 [Niklas Edmundsson <nikke acc.umu.se>]
 
-  *) mod_mem_cache: Memory leak fix: Unconditionally free the buffer.
-     [Davi Arnaut <davi haxent.com.br>]
-
   *) mod_proxy: Print the correct error message for erroneous configured
      ProxyPass directives. PR 40439. [serai lans-tv.com]
 
@@ -238,6 +235,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.4
 
+  *) mod_mem_cache: Memory leak fix: Unconditionally free the buffer.
+     [Davi Arnaut <davi haxent.com.br>]
+
   *) Allow mod_dumpio to log at other than DEBUG levels via
      the new DumpIOLogLevel directive. [Jim Jagielski]