svn commit: r292950 - /httpd/httpd/trunk/CHANGES

[tr...@apache.org]

Author: trawick
Date: Sat Oct  1 04:03:10 2005
New Revision: 292950

URL: http://svn.apache.org/viewcvs?rev=292950&view=rev
Log:
sync with 2.2 branch

Modified:
    httpd/httpd/trunk/CHANGES

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=292950&r1=292949&r2=292950&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Oct  1 04:03:10 2005
@@ -2,10 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) SECURITY: CAN-2005-2970 (cve.mitre.org)
-     worker MPM: Fix a memory leak which can occur after an aborted
-     connection in some limited circumstances.  [Greg Ames, Jeff Trawick]
-
   *) Move mod_dbd to /modules/database/ (Nick Kew)
 
   *) Move mod_filter and mod_charset_lite to /modules/filters/ (Nick Kew)
@@ -27,6 +23,10 @@
      [Martin Kraemer, David Reid]
 
 Changes with Apache 2.1.9
+
+  *) SECURITY: CAN-2005-2970 (cve.mitre.org)
+     worker MPM: Fix a memory leak which can occur after an aborted
+     connection in some limited circumstances.  [Greg Ames, Jeff Trawick]
 
   *) Doxygen fixup [Neale Ranns <neale ranns.org>, Ian Holsman]