Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r706318 -
 /httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
Date: Mon, 20 Oct 2008 15:11:05 -0000
To: cvs@httpd.apache.org
From: jfclere@apache.org
Message-Id: <20081020151106.14F2923888A3@eris.apache.org>

Author: jfclere
Date: Mon Oct 20 08:11:05 2008
New Revision: 706318

URL: http://svn.apache.org/viewvc?rev=706318&view=rev
Log:
ap_proxy_determine_connection modifies the url if we are retrying the result we should retry using the orginal url.

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c?rev=706318&r1=706317&r2=706318&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c Mon Oct 20 08:11:05 2008
@@ -645,9 +645,10 @@
 
     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));
 
@@ -685,7 +686,7 @@
             }
         }
         /* 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;
     }