Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 5925 invoked from network); 18 Apr 2004 19:42:37 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 18 Apr 2004 19:42:37 -0000 Received: (qmail 80128 invoked by uid 500); 18 Apr 2004 19:42:26 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 80016 invoked by uid 500); 18 Apr 2004 19:42:25 -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 80003 invoked by uid 500); 18 Apr 2004 19:42:25 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 80000 invoked from network); 18 Apr 2004 19:42:25 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 18 Apr 2004 19:42:25 -0000 Received: (qmail 5906 invoked by uid 1569); 18 Apr 2004 19:42:34 -0000 Date: 18 Apr 2004 19:42:34 -0000 Message-ID: <20040418194234.5905.qmail@minotaur.apache.org> From: nd@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0/modules/metadata mod_headers.c 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 2004/04/18 12:42:34 Modified: . CHANGES modules/metadata mod_headers.c Log: Allow ErrorHeader echo Revision Changes Path 1.1461 +2 -0 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.1460 retrieving revision 1.1461 diff -u -u -r1.1460 -r1.1461 --- CHANGES 18 Apr 2004 19:17:43 -0000 1.1460 +++ CHANGES 18 Apr 2004 19:42:34 -0000 1.1461 @@ -2,6 +2,8 @@ [Remove entries to the current 2.0 section below, when backported] + *) mod_headers: Allow 'echo' also for ErrorHeaders. [Andr� Malo] + *) mod_headers no longer crashes if an empty header value should be added. [Andr� Malo] 1.57 +3 -2 httpd-2.0/modules/metadata/mod_headers.c Index: mod_headers.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/metadata/mod_headers.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -u -r1.56 -r1.57 --- mod_headers.c 18 Apr 2004 19:17:43 -0000 1.56 +++ mod_headers.c 18 Apr 2004 19:42:34 -0000 1.57 @@ -394,8 +394,9 @@ if (value) return "Header echo takes two arguments"; - else if (cmd->info != &hdr_out) - return "Header echo only valid on Header directive"; + else if (cmd->info != &hdr_out && cmd->info != &hdr_err) + return "Header echo only valid on Header and ErrorHeader " + "directives"; else { regex = ap_pregcomp(cmd->pool, hdr, REG_EXTENDED | REG_NOSUB); if (regex == NULL) {