sync with stable branch

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

diff --git a/CHANGES b/CHANGES
index 85ef4d7d0cfbaa984c6d4a89753d33c576c5f17f..53bdc1b8f96169cb93ec5a4cd7ad4593280a40ca 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -11,10 +11,6 @@ Changes with Apache 2.1.0-dev
   *) mod_ssl: Fix segfault on a non-SSL request if the the 'c' log
      format code is used. PR 22741. [Gary E. Miller <gem@rellim.com>]
 
-  *) Set the scoreboard state to indicate logging prior to running 
-     logging hooks so that server-status will show 'L' for hung loggers
-     instead of 'W'.  [Jeff Trawick]
-
   *) Log an error when requests for URIs which fail to map to a valid 
      filesystem name are rejected with 403.  [Jeff Trawick]
 
@@ -214,6 +210,12 @@ Changes with Apache 2.1.0-dev
   [Apache 2.1.0-dev includes those bug fixes and changes with the
    Apache 2.0.xx tree as documented, and except as noted, below.]
 
+Changes with Apache 2.0.49
+
+  *) Set the scoreboard state to indicate logging prior to running 
+     logging hooks so that server-status will show 'L' for hung loggers
+     instead of 'W'.  [Jeff Trawick]
+
 Changes with Apache 2.0.48
 
   *) SECURITY [CAN-2003-0789]: mod_cgid: Resolve some mishandling of