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

diff --git a/STATUS b/STATUS
index fa3c81ad87ba8ae8405c6748a688be03b2a22415..cc15761be166793254f4a175029654cc6ee79cb0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 ]

diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index 7d27abefb17444b4dc0c67cb4230535f7b84aa36..e6f9499d2d4db3837ce2ebdfc2b83d2aa2ff25cb 100644 (file)
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -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;
     }