Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 14809 invoked from network); 29 Mar 2004 02:37:59 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 29 Mar 2004 02:37:59 -0000 Received: (qmail 92294 invoked by uid 500); 29 Mar 2004 02:37:41 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 92275 invoked by uid 500); 29 Mar 2004 02:37:41 -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 92259 invoked by uid 500); 29 Mar 2004 02:37:41 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 92254 invoked from network); 29 Mar 2004 02:37:40 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 29 Mar 2004 02:37:40 -0000 Received: (qmail 14789 invoked by uid 1121); 29 Mar 2004 02:37:57 -0000 Date: 29 Mar 2004 02:37:57 -0000 Message-ID: <20040329023757.14788.qmail@minotaur.apache.org> From: trawick@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 trawick 2004/03/28 18:37:57 Modified: . Tag: APACHE_2_0_BRANCH STATUS Log: yet another merge Revision Changes Path No revision No revision 1.751.2.777 +5 -1 httpd-2.0/STATUS Index: STATUS =================================================================== RCS file: /home/cvs/httpd-2.0/STATUS,v retrieving revision 1.751.2.776 retrieving revision 1.751.2.777 diff -u -r1.751.2.776 -r1.751.2.777 --- STATUS 28 Mar 2004 18:44:48 -0000 1.751.2.776 +++ STATUS 29 Mar 2004 02:37:57 -0000 1.751.2.777 @@ -289,6 +289,10 @@ http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.269&r2=1.270 +1: trawick + * Don't include newlines in strings passed to ap_log_error. + http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/main.c?r1=1.155&r2=1.156 + +1: trawick + CURRENT RELEASE NOTES: * Backwards compatibility is expected of future Apache 2.0 releases,