propose 2 more merges

add wrowe's vote on a simple winnt fix that, in light of the fact that
I haven't compiled it yet and don't plan to, I'm in no great hurry to
commit ;)

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

diff --git a/STATUS b/STATUS
index ed32f021f6740671e737fa0673a85b30731d51f9..ab24d8b56048c559d819b4ad01756852ac5a4722 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/06/05 17:06:52 $]
+Last modified at [$Date: 2003/06/06 02:56:56 $]
 
 Release:
 
@@ -206,6 +206,14 @@ PATCHES TO PORT FROM 2.1
 
     * winnt MPM: fix some invalid ap_log_error() invocations
         server/mpm/winnt/child.c 1.15
+        +1: trawick, wrowe
+
+    * handle switching between libtools and unwritable ltconfig/ltmain.sh
+        buildconf 1.36, 1.37
+        +1: trawick
+
+    * Ignore the Server header field as set by modules and CGIs.
+        modules/http/http_protocol.c 1.470
         +1: trawick
 
 CURRENT RELEASE NOTES: