sync with 2.0

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

diff --git a/CHANGES b/CHANGES
index 6b22a27efc9fe4f03af36983264a8c3eeeb05511..5601596d17d30e978510784eea8a7e6d69931183 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,11 +2,6 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
-  *) Win32: apache -k start|restart|install|config can leave stranded
-     piped logger processes (eg, rotatelogs.exe) due to improper
-     server shutdown on these code paths.
-     [Bill Stoddard]
-
   *) Restructured mod_auth_ldap to fit the new authentication model.
      The module is now called authnz_ldap and has been moved out of
      the modules/experimental area and into modules/aaa with the other
@@ -396,6 +391,11 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.51
 
+  *) Win32: apache -k start|restart|install|config can leave stranded
+     piped logger processes (eg, rotatelogs.exe) due to improper
+     server shutdown on these code paths.
+     [Bill Stoddard]
+
   *) SECURITY: CAN-2004-0751 (cve.mitre.org)
      mod_ssl: Fix a segfault in the SSL input filter which could be
      triggered if using "speculative" mode, for instance by a