yet another merge

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

diff --git a/STATUS b/STATUS
index 983612e6b5535a9798eeec2af1cab11aa730d062..a3adbd864fd987b27d0f40a715e721e5c05532e0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/10/16 00:37:55 $]
+Last modified at [$Date: 2003/10/22 16:48:15 $]
 
 Release:
 
@@ -265,6 +265,13 @@ PATCHES TO BACKPORT FROM 2.1
         modules/filters/mod_include.c: r1.288
       +1: nd, trawick, jwoolley
 
+    * 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'.
+        modules/http/http_request.c r1.159
+        server/protocol.c r1.138
+      +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,