From cvs-return-17405-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org Mon Nov 24 21:38:42 2003 Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 47164 invoked from network); 24 Nov 2003 21:38:42 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 24 Nov 2003 21:38:42 -0000 Received: (qmail 94615 invoked by uid 500); 24 Nov 2003 21:38:28 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 94572 invoked by uid 500); 24 Nov 2003 21:38:27 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 94517 invoked by uid 500); 24 Nov 2003 21:38:27 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 94504 invoked from network); 24 Nov 2003 21:38:27 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 24 Nov 2003 21:38:27 -0000 Received: (qmail 47103 invoked by uid 1569); 24 Nov 2003 21:38:38 -0000 Date: 24 Nov 2003 21:38:38 -0000 Message-ID: <20031124213838.47102.qmail@minotaur.apache.org> From: nd@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0 STATUS X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N nd 2003/11/24 13:38:38 Modified: . Tag: APACHE_2_0_BRANCH STATUS Log: merges++ Revision Changes Path No revision No revision 1.751.2.559 +9 -1 httpd-2.0/STATUS Index: STATUS =================================================================== RCS file: /home/cvs/httpd-2.0/STATUS,v retrieving revision 1.751.2.558 retrieving revision 1.751.2.559 diff -u -u -r1.751.2.558 -r1.751.2.559 --- STATUS 22 Nov 2003 02:34:09 -0000 1.751.2.558 +++ STATUS 24 Nov 2003 21:38:37 -0000 1.751.2.559 @@ -62,6 +62,14 @@ 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! ]