Commit 3d7eeedf authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r706318 from trunk: 

ap_proxy_determine_connection modifies the url if we are retrying the result we should retry using the orginal url.

Submitted by: jfclere
Reviewed by: jim


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

STATUS

+0 −4
Changes for STATUS: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -85,10 +85,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   * proxy_ajp: ap_proxy_determine_connection modifies the url if we are

       retrying the result we should retry using the orginal url.

        http://svn.apache.org/viewvc?rev=706318&view=rev

     +1: jfclere, rpluem, jim



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

modules/proxy/mod_proxy_ajp.c

+3 −2
Changes for modules/proxy/mod_proxy_ajp.c: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -598,9 +598,10 @@ static int proxy_ajp_handler(request_rec *r, proxy_worker *worker, 


    retry = 0;

    while (retry < 2) {

        char *locurl = url;

        /* Step One: Determine Who To Connect To */

        status = ap_proxy_determine_connection(p, r, conf, worker, backend,

                                               uri, &url, proxyname, proxyport,

                                               uri, &locurl, proxyname, proxyport,

                                               server_portstr,

                                               sizeof(server_portstr));
@@ -638,7 +639,7 @@ static int proxy_ajp_handler(request_rec *r, proxy_worker *worker, 
            }

        }

        /* Step Three: Process the Request */

        status = ap_proxy_ajp_request(p, r, backend, origin, dconf, uri, url,

        status = ap_proxy_ajp_request(p, r, backend, origin, dconf, uri, locurl,

                                      server_portstr);

        break;

    }