merges++

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

diff --git a/STATUS b/STATUS
index 267f88c0aa7d120061202088eca3af562fd22be8..8c96c0f8517837dfe526aa6a60a28f96239a34bc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/11/22 02:34:09 $]
+Last modified at [$Date: 2003/11/24 21:38:37 $]
 
 Release:
 
@@ -62,6 +62,14 @@ Contributors looking for a mission:
 
 RELEASE SHOWSTOPPERS:
 
+    * core: Escape arbitrary data before writing into the errorlog
+      [CAN-2003-0020]  (2.0 + 1.3)
+        include/ap_mmn.h: r1.61
+        include/httpd.h: r1.203
+        server/log.c: r1.136
+        server/util.c: r1.143
+      +1: nd
+
 PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]