Commit c6f94d3c authored by Yann Ylavic's avatar Yann Ylavic
Browse files

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
parent 93899fdc

server/core_filters.c

+3 −7
Changes for server/core_filters.c: 3 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -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;

    }