From dev-return-5870-apmail-apr-dev-archive=apr.apache.org@apr.apache.org Sat Mar 02 23:40:17 2002 Return-Path: Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 72204 invoked by uid 500); 2 Mar 2002 23:40:17 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 72193 invoked from network); 2 Mar 2002 23:40:17 -0000 Date: Sat, 02 Mar 2002 15:44:03 -0800 From: Brian Pane Subject: Re: update for bucket api patch To: dev@apr.apache.org Message-id: <3C8163C3.1090806@pacbell.net> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii; format=flowed Content-transfer-encoding: 7BIT X-Accept-Language: en-us User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:0.9.8) Gecko/20020204 References: X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N Cliff Woolley wrote: >On Sat, 2 Mar 2002, Brian Pane wrote: > >>I had to add an allocator as an argument to >>SPLIT_AND_PASS_PRETAG_BUCKETS to get mod_include >>and mod_cgi to work (a patch against current CVS head >>is attached) >> > >Whoops, that must have gotten lost in the big cvs-conflict-resolution run. >Don't know how I managed to get it to compile... . Anyway, what I >would have done it this way: > > >Index: mod_include.h >=================================================================== >RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.h,v >retrieving revision 1.29 >diff -u -d -r1.29 mod_include.h >--- mod_include.h 23 Feb 2002 20:56:36 -0000 1.29 >+++ mod_include.h 2 Mar 2002 23:20:55 -0000 >@@ -208,7 +209,8 @@ > \ > tag_plus = apr_brigade_split(brgd, cntxt->head_start_bucket); \ > if (cntxt->output_flush) { \ >- APR_BRIGADE_INSERT_TAIL(brgd, apr_bucket_flush_create()); \ >+ APR_BRIGADE_INSERT_TAIL(brgd, \ >+ apr_bucket_flush_create(brgd->bucket_alloc)); \ > } \ > rc = ap_pass_brigade(next, brgd); \ > cntxt->bytes_parsed = 0; \ > Makes sense; I like this approach a lot better than my patch to add an extra arg --Brian