You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2008/03/17 15:32:49 UTC
svn commit: r637902 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/filters/mod_include.c
Author: jim
Date: Mon Mar 17 07:32:47 2008
New Revision: 637902
URL: http://svn.apache.org/viewvc?rev=637902&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/filters/mod_include.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=637902&r1=637901&r2=637902&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Mar 17 07:32:47 2008
@@ -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]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=637902&r1=637901&r2=637902&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Mar 17 07:32:47 2008
@@ -86,14 +86,6 @@
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 ]
Modified: httpd/httpd/branches/2.2.x/modules/filters/mod_include.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/filters/mod_include.c?rev=637902&r1=637901&r2=637902&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/mod_include.c (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/mod_include.c Mon Mar 17 07:32:47 2008
@@ -3307,6 +3307,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;
}
@@ -3359,6 +3360,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;
}
@@ -3399,6 +3401,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;