Commit c6f08a39 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1756852, r1756853 from trunk: 

Be more consistent when we alocate this brigade.
This should save a few bytes in case of early exit and is, IMHO, cleaner.

Fix some style (spaces only)
Submitted by: jailletc36
Reviewed/backported by: jim


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

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -131,13 +131,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.4.x patch: trunk works

     +1: jchampion, wrowe, covener



   * mod_proxy_connect: Delay some memory allocation

                        Fix some style (space only)

     trunk patch: http://svn.apache.org/r1756852

                  http://svn.apache.org/r1756853

     2.4.x patch: trunk works

     +1: jailletc36, jchampion, covener



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/proxy/mod_proxy_connect.c

+6 −5
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker, 
    conn_rec *backconn;

    int done = 0;



    apr_bucket_brigade *bb_front = apr_brigade_create(p, c->bucket_alloc);

    apr_bucket_brigade *bb_front;

    apr_bucket_brigade *bb_back;

    apr_status_t rv;

    apr_size_t nbytes;
@@ -315,6 +315,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker, 
                   backconn->local_addr->port));





    bb_front = apr_brigade_create(p, c->bucket_alloc);

    bb_back = apr_brigade_create(p, backconn->bucket_alloc);



    /* If we are connecting through a remote proxy, we need to pass