Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 51211 invoked from network); 10 Dec 2003 02:33:54 -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:33:54 -0000 Received: (qmail 78265 invoked by uid 500); 10 Dec 2003 02:33:31 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 78213 invoked by uid 500); 10 Dec 2003 02:33:31 -0000 Mailing-List: contact dev-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 dev@httpd.apache.org Received: (qmail 78199 invoked from network); 10 Dec 2003 02:33:31 -0000 Received: from unknown (HELO mail.logilune.com) (195.154.174.52) by daedalus.apache.org with SMTP; 10 Dec 2003 02:33:31 -0000 Received: from stason.org (localhost.logilune.com [127.0.0.1]) by mail.logilune.com (Postfix) with ESMTP id E3B0978E22 for ; Wed, 10 Dec 2003 03:33:38 +0100 (CET) Message-ID: <3FD6877E.3070209@stason.org> Date: Tue, 09 Dec 2003 18:39:58 -0800 From: Stas Bekman Organization: Hope, Humanized User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030630 X-Accept-Language: en-us, en, he, ru MIME-Version: 1.0 To: dev@httpd.apache.org Subject: Re: cvs commit: httpd-2.0 CHANGES References: <3FD608BA.7080103@stason.org> <20031209015821.12851.qmail@minotaur.apache.org> <3FD5A621.807@attglobal.net> <3FD608BA.7080103@stason.org> <5.2.0.9.2.20031209143315.02795eb8@pop3.rowe-clan.net> <3FD650F6.9090002@stason.org> In-Reply-To: <3FD650F6.9090002@stason.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit 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 Bekman wrote: > Here is an adjusted patch, I've s/include/INCLUDES/ in your suggestion. Now committed. please +1 to backport in STATUS so we can move on... > Index: modules/filters/mod_include.c > =================================================================== > RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v > retrieving revision 1.291 > diff -u -r1.291 mod_include.c > --- modules/filters/mod_include.c 9 Dec 2003 01:58:21 -0000 > 1.291 > +++ modules/filters/mod_include.c 9 Dec 2003 22:39:32 -0000 > @@ -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); > } __________________________________________________________________ Stas Bekman JAm_pH ------> Just Another mod_perl Hacker http://stason.org/ mod_perl Guide ---> http://perl.apache.org mailto:stas@stason.org http://use.perl.org http://apacheweek.com http://modperlbook.org http://apache.org http://ticketmaster.com