merge

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

diff --git a/STATUS b/STATUS
index a6b75fdd984c39a60712657df562eb2e73125c9c..7ea84f21d00d090aa3fc1d334e6caf6013833dc4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/04/28 18:09:59 $]
+Last modified at [$Date: 2004/04/28 23:36:31 $]
 
 Release:
 
@@ -367,6 +367,10 @@ PATCHES TO BACKPORT FROM 2.1
       which integrates the two rounds of changes)
       +1 concept: trawick
 
+    * Make sure long request lines are '\0'-terminated. (PR 28376)
+      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/protocol.c?r1=1.147&r2=1.148
+      +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,