sync with 2.0.48

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/CHANGES b/CHANGES
index d992fa9034d8113cd40919022129df94972d8f64..42ea800263de02558e7a5c3dfa1cf2791d6ad91b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,14 +2,6 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
-  *) Lower the severity of the "listener thread didn't exit" message 
-     to debug, as it is of interest only to developers.  PR 9011
-     [Jeff Trawick]
-
-  *) Fix a misleading message from the some of the threaded MPMs when 
-     MaxClients has to be lowered due to the setting of ServerLimit.  
-     [Jeff Trawick]
-
   *) Switch to APR 1.0 API.
 
   *) Modify ap_get_client_block() to note if it has seen EOS.
@@ -254,6 +246,14 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.48
 
+  *) Fix a misleading message from the some of the threaded MPMs when 
+     MaxClients has to be lowered due to the setting of ServerLimit.  
+     [Jeff Trawick]
+
+  *) Lower the severity of the "listener thread didn't exit" message
+     to debug, as it is of interest only to developers.  PR 9011
+     [Jeff Trawick]
+
   *) Install config.nice into the build/ directory to make
      minor version upgrades easier. [Joshua Slive]