Commit 39c1c0b9 authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Merge r1601624 from trunk: 

Strip useless apr_brigade_cleanup() calls.

Submitted/backported by: ylavic
Reviewed by: jailletc36, jim, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1734391 13f79535-47bb-0310-9956-ffa450edef68
parent b9e579c1

modules/echo/mod_echo.c

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ static int process_echo_connection(conn_rec *c) 


        /* Something horribly wrong happened.  Someone didn't block! */

        if (APR_BRIGADE_EMPTY(bb)) {

            apr_brigade_cleanup(bb);

            ap_log_error(APLOG_MARK, APLOG_INFO, rv, c->base_server, APLOGNO(01612)

                         "ProtocolEcho: Error - read empty brigade from %s!",

                         c->client_ip);

modules/filters/mod_deflate.c

+0 −2
Original line number Diff line number Diff line
@@ -977,7 +977,6 @@ static apr_status_t deflate_out_filter(ap_filter_t *f, 
        apr_bucket_delete(e);

    }



    apr_brigade_cleanup(bb);

    return APR_SUCCESS;

}
@@ -1856,7 +1855,6 @@ static apr_status_t inflate_out_filter(ap_filter_t *f, 
        apr_bucket_delete(e);

    }



    apr_brigade_cleanup(bb);

    return APR_SUCCESS;

}

modules/filters/mod_ratelimit.c

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ rate_limit_filter(ap_filter_t *f, apr_bucket_brigade *input_bb) 


        if (!APR_BRIGADE_EMPTY(ctx->holdingbb)) {

            APR_BRIGADE_CONCAT(bb, ctx->holdingbb);

            apr_brigade_cleanup(ctx->holdingbb);

        }



        while (ctx->state == RATE_FULLSPEED && !APR_BRIGADE_EMPTY(bb)) {

modules/filters/mod_substitute.c

+1 −1
Original line number Diff line number Diff line
@@ -427,8 +427,8 @@ static apr_status_t substitute_filter(ap_filter_t *f, apr_bucket_brigade *bb) 
                if (rv != APR_SUCCESS)

                    goto err;

                APR_BRIGADE_CONCAT(ctx->passbb, ctx->pattbb);

            }

                apr_brigade_cleanup(ctx->linebb);

            }

            APR_BUCKET_REMOVE(b);

            APR_BRIGADE_INSERT_TAIL(ctx->passbb, b);

        }

modules/generators/mod_cgi.c

+0 −2
Original line number Diff line number Diff line
@@ -924,8 +924,6 @@ static int cgi_handler(request_rec *r) 


    AP_DEBUG_ASSERT(script_in != NULL);



    apr_brigade_cleanup(bb);



#if APR_FILES_AS_SOCKETS

    apr_file_pipe_timeout_set(script_in, 0);

    apr_file_pipe_timeout_set(script_err, 0);