From: Ryan Bloom <rbb@apache.org>
Date: Tue, 14 Nov 2000 04:22:03 +0000 (+0000)
Subject: Associate a pool with the pool bucket so that it serves it's intended
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca2801f8aba7d961374e8579785890fb6383c027;p=apache

Associate a pool with the pool bucket so that it serves it's intended
purpose.  This also moves the create_pool function outside of an if to
decrease complexity.


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

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index 84f281e9f8..d5552405c9 100644
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -3056,12 +3056,11 @@ static apr_status_t coalesce_filter(ap_filter_t *f, ap_bucket_brigade *b)
 
     if (pass_the_brigade) {
         /* Insert ctx->buf into the correct spot in the brigade */
+        e = ap_bucket_create_pool(ctx->buf, ctx->cnt, p);
         if (insert_first) {
-            e = ap_bucket_create_pool(ctx->buf, ctx->cnt, NULL);
             AP_BRIGADE_INSERT_HEAD(b, e);
         } 
         else if (insert_before) {
-            e = ap_bucket_create_pool(ctx->buf, ctx->cnt, NULL);
             AP_BUCKET_INSERT_BEFORE(e, insert_before);
             AP_BUCKET_REMOVE(insert_before);
             ap_bucket_destroy(insert_before);