sync with 2.0.49-dev

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

diff --git a/CHANGES b/CHANGES
index b3b7caf63191f0f82e863a2066ab2a15902d3cb5..de347e38bb3fc6a6cacfa81385eb878d8ed8191a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,6 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
-  *) mod_cgid: Fix storage corruption caused by use of incorrect pool.
-     [Jeff Trawick]
-
   *) Satisfy directives now can be influenced by a surrounding <Limit>
      container.  PR 14726.  [André Malo]
 
@@ -283,6 +280,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_cgid: Fix storage corruption caused by use of incorrect pool.
+     [Jeff Trawick]
+
   *) Win32: find_read_listeners was not correctly handling multiple
      listeners on the Win32DisableAcceptEx path.  [Bill Stoddard]