From: Jeff Trawick <trawick@apache.org>
Date: Wed, 20 Sep 2000 18:36:05 +0000 (+0000)
Subject: Fix mixup in call to ap_brigade_split().
X-Git-Tag: APACHE_2_0_ALPHA_7~128
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fa42d5cca242a1d350ab9d71a520e73fb668dab;p=thirdparty%2Fapache%2Fhttpd.git

Fix mixup in call to ap_brigade_split().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86266 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 727c81f16be..6d2f88792b2 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -2268,7 +2268,7 @@ static void send_parsed_content(ap_bucket_brigade *bb, request_rec *r,
     ap_bucket *dptr = AP_BRIGADE_FIRST(bb);
     ap_bucket *tagbuck, *dptr2;
     ap_bucket *endsec;
-    ap_bucket_brigade *before_tag = NULL;
+    ap_bucket_brigade *tag_and_after;
     int ret;
 
     apr_cpystrn(error, DEFAULT_ERROR_MSG, sizeof(error));
@@ -2316,8 +2316,9 @@ static void send_parsed_content(ap_bucket_brigade *bb, request_rec *r,
 		ap_rputs(error, r);
                 return;
             }
-            before_tag = ap_brigade_split(bb, dptr);
-            ap_pass_brigade(f->next, before_tag);
+            tag_and_after = ap_brigade_split(bb, dptr);
+            ap_pass_brigade(f->next, bb); /* process what came before the tag */
+            bb = tag_and_after;
             if (!strcmp(directive, "if")) {
                 if (!printing) {
                     if_nesting++;