sync with stable branch

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

diff --git a/CHANGES b/CHANGES
index ecd16a24d5c4871e6c0653a5b5e196af1ba2655f..8797ce955a95a8140619abb50d06c2d6f7a78a04 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,9 +17,6 @@ Changes with Apache 2.1.0-dev
      in the initial container.  PR 25414. 
      [Geoffrey Young <geoff apache.org>]
 
-  *) Fix memory leak in handling of request bodies during reverse
-     proxy operations.  PR 24991. [Larry Toppi <larry.toppi citrix.com>]
-
   *) Clean up httpd -V output: Instead of displaying the MPM source
      directory, display the MPM name and some MPM properties.
      [Geoffrey Young <geoff apache.org>]
@@ -75,9 +72,6 @@ Changes with Apache 2.1.0-dev
   *) mod_autoindex / core: Don't fail to show filenames containing
      special characters like '%'. PR 13598.  [André Malo]
 
-  *) mod_status: Report total CPU time accurately when using a threaded
-     MPM.  PR 23795.  [Jeff Trawick]
-
   *) mod_ssl: Fix segfault on a non-SSL request if the the 'c' log
      format code is used. PR 22741. [Gary E. Miller <gem rellim.com>]
 
@@ -264,6 +258,13 @@ Changes with Apache 2.1.0-dev
    Apache 2.0.xx tree as documented, and except as noted, below.]
 
 Changes with Apache 2.0.49
+
+  *) mod_status: Report total CPU time accurately when using a threaded
+     MPM.  PR 23795.  [Jeff Trawick]
+
+  *) Fix memory leak in handling of request bodies during reverse
+     proxy operations.  PR 24991. [Larry Toppi <larry.toppi citrix.com>]
+
   *) Win32 MPM: Implement MaxMemFree to enable setting an upper
      limit on the amount of storage used by the bucket brigades
      in each server thread. [Bill Stoddard]