From f46ac6d7394218d5e8d3a4c3ce850e7dd479c4e9 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 20 Jul 2018 15:04:55 +0000 Subject: [PATCH] core: follow up to r1836237: core filter's tmp_flush_bb not used anymore. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1836354 13f79535-47bb-0310-9956-ffa450edef68 --- server/core_filters.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/server/core_filters.c b/server/core_filters.c index 5e5d5cf149..02256e90b3 100644 --- a/server/core_filters.c +++ b/server/core_filters.c @@ -78,7 +78,6 @@ do { \ #define APLOG_MODULE_INDEX AP_CORE_MODULE_INDEX struct core_output_filter_ctx { - apr_bucket_brigade *tmp_flush_bb; apr_bucket_brigade *empty_bb; apr_size_t bytes_written; struct iovec *vec; @@ -370,12 +369,6 @@ apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) if (ctx == NULL) { ctx = apr_pcalloc(c->pool, sizeof(*ctx)); net->out_ctx = (core_output_filter_ctx_t *)ctx; - /* - * Need to create tmp brigade with correct lifetime. Passing - * NULL to apr_brigade_split_ex would result in a brigade - * allocated from bb->pool which might be wrong. - */ - ctx->tmp_flush_bb = apr_brigade_create(c->pool, c->bucket_alloc); } /* remain compatible with legacy MPMs that passed NULL to this filter */ @@ -383,6 +376,9 @@ apr_status_t ap_core_output_filter(ap_filter_t *f, apr_bucket_brigade *bb) if (ctx->empty_bb == NULL) { ctx->empty_bb = apr_brigade_create(c->pool, c->bucket_alloc); } + else { + apr_brigade_cleanup(ctx->empty_bb); + } bb = ctx->empty_bb; } -- 2.40.0