Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 26932 invoked from network); 18 Feb 2004 15:48:07 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 18 Feb 2004 15:48:07 -0000 Received: (qmail 67861 invoked by uid 500); 18 Feb 2004 15:47:43 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 67815 invoked by uid 500); 18 Feb 2004 15:47:42 -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 67781 invoked by uid 500); 18 Feb 2004 15:47:42 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 67760 invoked from network); 18 Feb 2004 15:47:42 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 18 Feb 2004 15:47:42 -0000 Received: (qmail 26680 invoked by uid 1462); 18 Feb 2004 15:47:47 -0000 Date: 18 Feb 2004 15:47:47 -0000 Message-ID: <20040218154747.26679.qmail@minotaur.apache.org> From: geoff@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 geoff 2004/02/18 07:47:47 Modified: . Tag: APACHE_2_0_BRANCH STATUS Log: "Expected > but saw " backport Revision Changes Path No revision No revision 1.751.2.689 +6 -1 httpd-2.0/STATUS Index: STATUS =================================================================== RCS file: /home/cvs/httpd-2.0/STATUS,v retrieving revision 1.751.2.688 retrieving revision 1.751.2.689 diff -u -r1.751.2.688 -r1.751.2.689 --- STATUS 16 Feb 2004 18:47:57 -0000 1.751.2.688 +++ STATUS 18 Feb 2004 15:47:46 -0000 1.751.2.689 @@ -80,6 +80,11 @@ [ please place file names and revisions from HEAD here, so it is easy to identify exactly what the proposed changes are! ] + * fix "Expected > but saw " errors in nested, + argumentless containers. + http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/config.c?r1=1.172&r2=1.173 + +1: geoff + * mod_ssl: Clear OpenSSL error stack during pphrase entry to prevent spurious failures in SSL functions later. PR: 21160