Return-Path: Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: (qmail 182 invoked from network); 10 Dec 2003 04:56: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 04:56:54 -0000 Received: (qmail 16745 invoked by uid 500); 10 Dec 2003 04:56:29 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 16711 invoked by uid 500); 10 Dec 2003 04:56:28 -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 16698 invoked from network); 10 Dec 2003 04:56:28 -0000 Received: from unknown (HELO suntzu.lyra.org) (198.144.203.208) by daedalus.apache.org with SMTP; 10 Dec 2003 04:56:28 -0000 Received: (from gstein@localhost) by suntzu.lyra.org (8.11.6/8.11.6) id hBA4rkj20998 for dev@httpd.apache.org; Tue, 9 Dec 2003 20:53:46 -0800 X-Authentication-Warning: suntzu.lyra.org: gstein set sender to gstein@lyra.org using -f Date: Tue, 9 Dec 2003 20:53:46 -0800 From: Greg Stein To: dev@httpd.apache.org Subject: Re: cvs commit: httpd-2.0 CHANGES Message-ID: <20031209205346.C20846@lyra.org> Mail-Followup-To: dev@httpd.apache.org 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> <3FD6877E.3070209@stason.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <3FD6877E.3070209@stason.org>; from stas@stason.org on Tue, Dec 09, 2003 at 06:39:58PM -0800 X-URL: http://www.lyra.org/greg/ 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 This is where process gets in the way of just doing the right thing. Backport it for chrissakes. -g On Tue, Dec 09, 2003 at 06:39:58PM -0800, Stas Bekman wrote: > 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 -- Greg Stein, http://www.lyra.org/