Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 990 invoked from network); 20 Feb 2008 13:44:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Feb 2008 13:44:58 -0000 Received: (qmail 47558 invoked by uid 500); 20 Feb 2008 13:44:51 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 47500 invoked by uid 500); 20 Feb 2008 13:44:51 -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: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 47489 invoked by uid 99); 20 Feb 2008 13:44:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Feb 2008 05:44:51 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Feb 2008 13:44:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 73C111A9832; Wed, 20 Feb 2008 05:44:24 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r629456 - in /httpd/httpd/trunk: CHANGES modules/filters/mod_include.c Date: Wed, 20 Feb 2008 13:44:23 -0000 To: cvs@httpd.apache.org From: rpluem@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080220134424.73C111A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rpluem Date: Wed Feb 20 05:44:22 2008 New Revision: 629456 URL: http://svn.apache.org/viewvc?rev=629456&view=rev Log: * Set aside buckets that remain unprocessed in the filter context for the next filter pass. PR: 44447 Submitted by: Harald Niesche Reviewed by: rpluem Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/modules/filters/mod_include.c Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=629456&r1=629455&r2=629456&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Wed Feb 20 05:44:22 2008 @@ -2,6 +2,9 @@ Changes with Apache 2.3.0 [ When backported to 2.2.x, remove entry from this file ] + *) mod_include: Correctly handle SSI directives split over multiple filter + passes. PR 44447 [Harald Niesche ] + *) http_filters: Don't returm 100-continue on client error PR 43711 [Chetan Reddy ] Modified: httpd/httpd/trunk/modules/filters/mod_include.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_include.c?rev=629456&r1=629455&r2=629456&view=diff ============================================================================== --- httpd/httpd/trunk/modules/filters/mod_include.c (original) +++ httpd/httpd/trunk/modules/filters/mod_include.c Wed Feb 20 05:44:22 2008 @@ -3312,6 +3312,7 @@ if (store) { if (index) { APR_BUCKET_REMOVE(b); + apr_bucket_setaside(b, r->pool); APR_BRIGADE_INSERT_TAIL(intern->tmp_bb, b); b = newb; } @@ -3364,6 +3365,7 @@ if (store) { if (index) { APR_BUCKET_REMOVE(b); + apr_bucket_setaside(b, r->pool); APR_BRIGADE_INSERT_TAIL(intern->tmp_bb, b); b = newb; } @@ -3404,6 +3406,7 @@ default: /* partial match */ newb = APR_BUCKET_NEXT(b); APR_BUCKET_REMOVE(b); + apr_bucket_setaside(b, r->pool); APR_BRIGADE_INSERT_TAIL(intern->tmp_bb, b); b = newb; break;