From: Jeff Trawick <trawick@apache.org>
Date: Sat, 1 Oct 2005 11:03:10 +0000 (+0000)
Subject: sync with 2.2 branch
X-Git-Tag: 2.3.0~2925
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c74433edc1c82aa9c305a6a8b580005f363a183;p=thirdparty%2Fapache%2Fhttpd.git

sync with 2.2 branch


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

diff --git a/CHANGES b/CHANGES
index 9a63420defd..76226947b1c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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)
@@ -28,6 +24,10 @@ Changes with Apache 2.3.0
 
 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]
 
   *) mod_cache/mod_dir: Correct a subrequest lookup bug which was preventing