Commit 9f52b339 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Fix a style problem; b is ambigous (is it a brigade or bucket?)
  bb is far less ambigous.

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

modules/proxy/mod_proxy_http.c

+5 −5
Changes for modules/proxy/mod_proxy_http.c: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void terminate_headers(apr_bucket_alloc_t *bucket_alloc, 


static apr_status_t pass_brigade(apr_bucket_alloc_t *bucket_alloc,

                                 request_rec *r, proxy_conn_rec *conn,

                                 conn_rec *origin, apr_bucket_brigade *b,

                                 conn_rec *origin, apr_bucket_brigade *bb,

                                 int flush)

{

    apr_status_t status;
@@ -176,19 +176,19 @@ static apr_status_t pass_brigade(apr_bucket_alloc_t *bucket_alloc, 


    if (flush) {

        apr_bucket *e = apr_bucket_flush_create(bucket_alloc);

        APR_BRIGADE_INSERT_TAIL(b, e);

        APR_BRIGADE_INSERT_TAIL(bb, e);

    }

    apr_brigade_length(b, 0, &transferred);

    apr_brigade_length(bb, 0, &transferred);

    if (transferred != -1)

        conn->worker->s->transferred += transferred;

    status = ap_pass_brigade(origin->output_filters, b);

    status = ap_pass_brigade(origin->output_filters, bb);

    if (status != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,

                     "proxy: pass request data failed to %pI (%s)",

                     conn->addr, conn->hostname);

        return status;

    }

    apr_brigade_cleanup(b);

    apr_brigade_cleanup(bb);

    return APR_SUCCESS;

}