Sync with 2.0.49 tag.

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

diff --git a/CHANGES b/CHANGES
index 648e91a9838264d63c4708d36b792f45b9c62a19..ffc82b21a58ccb26817143b7a93953fff8bff9e6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,16 +2,6 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
-  *) Fix bug in mod_usertrack when no CookieName is set.  PR 24483.
-     [Manni Wood <manniwood planet-save.com>]
-
-  *) Remove compile-time length limit on request strings. Length is
-     now enforced solely with the LimitRequestLine config directive.
-     [Paul J. Reder]
-
-  *) mod_ssl: Send the Close Alert message to the peer before closing
-     the SSL session. [Madhusudan Mathihalli, Joe Orton]
-
   *) mod_setenvif: Remove "support" for Remote_User variable which
      never worked at all. PR 25725.  [André Malo]
 
@@ -41,9 +31,6 @@ Changes with Apache 2.1.0-dev
   *) Delete some make-generated files in the server directory during 
      "make clean" processing.  PR 26552.  [Jeff Trawick]
 
-  *) Fixed file extensions for real media files and removed rpm extension
-     from mime.types. PR 26079.  [Allan Sandfeld <kde carewolf.com>]
-
   *) Unix MPMs: Stop dropping connections when the file descriptor
      is at least FD_SETSIZE.  [Jeff Trawick]
 
@@ -92,11 +79,6 @@ Changes with Apache 2.1.0-dev
      header fields can be set for return even on errors or external
      redirects.  [Ken Coar]
 
-  *) Fix some piped log problems: bogus "piped log program '(null)'
-     failed" messages during restart and problem with the logger
-     respawning again after Apache is stopped.  PR 21648, PR 24805.
-     [Jeff Trawick]
-
   *) Fix <Limit> and <LimitExcept> parsing to require a closing '>' 
      in the initial container.  PR 25414. 
      [Geoffrey Young <geoff apache.org>]
@@ -274,6 +256,27 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) Win32: find_read_listeners was not correctly handling multiple
+     listeners on the Win32DisableAcceptEx path.  [Bill Stoddard]
+
+  *) Fix bug in mod_usertrack when no CookieName is set.  PR 24483.
+     [Manni Wood <manniwood planet-save.com>]
+
+  *) Fix some piped log problems: bogus "piped log program '(null)'
+     failed" messages during restart and problem with the logger
+     respawning again after Apache is stopped.  PR 21648, PR 24805.
+     [Jeff Trawick]
+
+  *) Fixed file extensions for real media files and removed rpm extension
+     from mime.types. PR 26079.  [Allan Sandfeld <kde carewolf.com>]
+
+  *) Remove compile-time length limit on request strings. Length is
+     now enforced solely with the LimitRequestLine config directive.
+     [Paul J. Reder]
+
+  *) mod_ssl: Send the Close Alert message to the peer before closing
+     the SSL session. [Madhusudan Mathihalli, Joe Orton]
+
   *) SECURITY: CAN-2004-0113 (cve.mitre.org)
      mod_ssl: Fix a memory leak in plain-HTTP-on-SSL-port handling.
      PR 27106.  [Joe Orton]