From: Jim Jagielski <jim@apache.org>
Date: Mon, 17 Mar 2008 14:32:47 +0000 (+0000)
Subject: Merge r629456 from trunk:
X-Git-Tag: 2.2.9~285
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7d6d4aebaf7bc5b2297b24e74867764bd79bff6;p=thirdparty%2Fapache%2Fhttpd.git

Merge r629456 from trunk:

* Set aside buckets that remain unprocessed in the filter context for the
  next filter pass.

PR: 44447
Submitted by: Harald Niesche <harald brokenerror.de>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@637902 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 4d77b15bf34..1b3d8d7566c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.9
- 
+
+  *) mod_include: Correctly handle SSI directives split over multiple filter
+     passes.  PR 44447 [Harald Niesche <harald brokenerror.de>]
+
   *) mod_cache: Revalidate cache entities which have Cache-Control: no-cache
      set in their response headers. PR 44511 [Ruediger Pluem]
 
diff --git a/STATUS b/STATUS
index 284cffd885b..b8d1bead228 100644
--- a/STATUS
+++ b/STATUS
@@ -86,14 +86,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_include: Set aside buckets that remain unprocessed in the filter 
-   context for the next filter pass. 
-   PR: 44447
-   Trunk version of patch: 
-       http://svn.apache.org/viewvc?rev=629456&view=rev
-   Backport version for 2.2.x of patch:
-       Trunk version of patch works
-   +1: covener, rpluem, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index db8b5faa946..1c683880cef 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -3307,6 +3307,7 @@ static apr_status_t send_parsed_content(ap_filter_t *f, apr_bucket_brigade *bb)
             if (store) {
                 if (index) {
                     APR_BUCKET_REMOVE(b);
+                    apr_bucket_setaside(b, r->pool);
                     APR_BRIGADE_INSERT_TAIL(intern->tmp_bb, b);
                     b = newb;
                 }
@@ -3359,6 +3360,7 @@ static apr_status_t send_parsed_content(ap_filter_t *f, apr_bucket_brigade *bb)
             if (store) {
                 if (index) {
                     APR_BUCKET_REMOVE(b);
+                    apr_bucket_setaside(b, r->pool);
                     APR_BRIGADE_INSERT_TAIL(intern->tmp_bb, b);
                     b = newb;
                 }
@@ -3399,6 +3401,7 @@ static apr_status_t send_parsed_content(ap_filter_t *f, apr_bucket_brigade *bb)
             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;