another merge proposal

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

diff --git a/STATUS b/STATUS
index 512c75966fa83d04dffd0ac58e496aea4e4795f9..627e15e2fb102c8a353cdc861d85d7444682a8b0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/03/19 14:40:10 $]
+Last modified at [$Date: 2004/03/21 11:17:01 $]
 
 Release:
 
@@ -265,6 +265,11 @@ PATCHES TO BACKPORT FROM 2.1
       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/arch/win32/mod_isapi.c?r1=1.98&r2=1.99
       +1: trawick, stoddard
 
+    * logresolve: Allow size of log line buffer to be overridden at
+      build time (MAXLINE).  PR 27793.
+      http://cvs.apache.org/viewcvs.cgi/httpd-2.0/support/logresolve.c?r1=1.22&r2=1.23
+      +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,