sync with 2.0.54-dev

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

diff --git a/CHANGES b/CHANGES
index 1cd4ecd5cd152803bb5998710c74a4ad9992fc15..2bfe02b503e9546ca9be2625b6f520476c73d98b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -157,9 +157,6 @@ Changes with Apache 2.1.2
   *) mod_proxy: Respect errors reported by pre_connection hooks.
      [Jeff Trawick]
 
-  *) worker MPM: Fix a problem which could cause httpd processes to
-     remain active after shutdown.  [Jeff Trawick]
-
   *) core: Error out on sections that are missing an argument instead of
      silently consuming the section. PR 25460.
      [Geoffrey Young, Paul Querna]
@@ -228,9 +225,6 @@ Changes with Apache 2.1.1
   *) mod_rewrite: Removed the MaxRedirects option in favor of the
      core LimitInternalRecursion directive.  [André Malo]
 
-  *) Unix MPMs: Shut down the server more quickly when child processes are
-     slow to exit.  [Joe Orton, Jeff Trawick]
-
   *) mod_info: Added listing of the Request Hooks and added more build 
      information like 'httpd -V' contains. Changed output to XHTML. 
      [Paul Querna]
@@ -627,6 +621,12 @@ Changes with Apache 2.1.1
 
 Changes with Apache 2.0.54
 
+  *) worker MPM: Fix a problem which could cause httpd processes to
+     remain active after shutdown.  [Jeff Trawick]
+
+  *) Unix MPMs: Shut down the server more quickly when child processes are
+     slow to exit.  [Joe Orton, Jeff Trawick]
+
   *) Remove formatting characters from ap_log_error() calls.  These
      were escaped as fallout from CAN-2003-0020.
      [Eric Covener <ecovener gmail.com>]