Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 50092 invoked from network); 10 Dec 2003 02:30:23 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 10 Dec 2003 02:30:23 -0000 Received: (qmail 76025 invoked by uid 500); 10 Dec 2003 02:30:05 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 75994 invoked by uid 500); 10 Dec 2003 02:30:05 -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 75981 invoked by uid 500); 10 Dec 2003 02:30:04 -0000 Delivered-To: apmail-httpd-2.0-cvs@apache.org Received: (qmail 75978 invoked from network); 10 Dec 2003 02:30:04 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 10 Dec 2003 02:30:04 -0000 Received: (qmail 50061 invoked by uid 1072); 10 Dec 2003 02:30:21 -0000 Date: 10 Dec 2003 02:30:21 -0000 Message-ID: <20031210023021.50060.qmail@minotaur.apache.org> From: stas@apache.org To: httpd-2.0-cvs@apache.org Subject: cvs commit: httpd-2.0 CHANGES 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 stas 2003/12/09 18:30:21 Modified: modules/filters mod_include.c . CHANGES Log: update the misconfigured INCLUDES skipping code to remove itself, so it'd complain only once Reviewed by: Jeff Trawick, Bill Rowe Revision Changes Path 1.292 +2 -1 httpd-2.0/modules/filters/mod_include.c Index: mod_include.c =================================================================== RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v retrieving revision 1.291 retrieving revision 1.292 diff -u -u -r1.291 -r1.292 --- mod_include.c 9 Dec 2003 01:58:21 -0000 1.291 +++ mod_include.c 10 Dec 2003 02:30:20 -0000 1.292 @@ -3603,7 +3603,8 @@ if (!(ap_allow_options(r) & OPT_INCLUDES)) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "mod_include: Options +Includes (or IncludesNoExec) " - "wasn't set, passing data unmodified"); + "wasn't set, INCLUDES filter removed"); + ap_remove_output_filter(f); return ap_pass_brigade(f->next, b); } 1.1335 +2 -1 httpd-2.0/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/httpd-2.0/CHANGES,v retrieving revision 1.1334 retrieving revision 1.1335 diff -u -u -r1.1334 -r1.1335 --- CHANGES 9 Dec 2003 01:58:21 -0000 1.1334 +++ CHANGES 10 Dec 2003 02:30:21 -0000 1.1335 @@ -5,7 +5,8 @@ *) complain via error_log when mod_include's INCLUDES filter is enabled, but the relevant Options flag allowing the filter to run for the specific resource wasn't set, so that the filter won't - silently get skipped. [Stas Bekman] + silently get skipped. next remove itself, so the warning will be + logged only once [Stas Bekman, Jeff Trawick, Bill Rowe] *) Clean up httpd -V output: Instead of displaying the MPM source directory, display the MPM name and some MPM properties.