You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2008/10/27 15:13:58 UTC
svn commit: r708194 - in /httpd/httpd/branches/2.2.x: ./ STATUS docs/
modules/proxy/mod_proxy_ajp.c support/ab.c support/suexec.c
Author: jim
Date: Mon Oct 27 07:13:57 2008
New Revision: 708194
URL: http://svn.apache.org/viewvc?rev=708194&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.2.x/ (props changed)
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/docs/ (props changed)
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c
httpd/httpd/branches/2.2.x/support/ab.c (props changed)
httpd/httpd/branches/2.2.x/support/suexec.c (props changed)
Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 27 07:13:57 2008
@@ -1 +1 @@
-/httpd/httpd/trunk:611483,639005,639010,647395,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093
+/httpd/httpd/trunk:611483,639005,639010,647395,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093,706318
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=708194&r1=708193&r2=708194&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Oct 27 07:13:57 2008
@@ -85,10 +85,6 @@
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 ]
Propchange: httpd/httpd/branches/2.2.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 27 07:13:57 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/docs:611483,639005,639010,647395,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693392,693727-693728,696006,697093,703441,703997
+/httpd/httpd/trunk/docs:611483,639005,639010,647395,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325,693392,693727-693728,696006,697093,703441,703997,706318
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c?rev=708194&r1=708193&r2=708194&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c Mon Oct 27 07:13:57 2008
@@ -598,9 +598,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));
@@ -638,7 +639,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;
}
Propchange: httpd/httpd/branches/2.2.x/support/ab.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 27 07:13:57 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/ab.c:83751-655654,657433,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093
+/httpd/httpd/trunk/support/ab.c:83751-655654,657433,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093,706318
Propchange: httpd/httpd/branches/2.2.x/support/suexec.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 27 07:13:57 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/suexec.c:611483,639005,639010,647395,655711,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093
+/httpd/httpd/trunk/support/suexec.c:611483,639005,639010,647395,655711,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754,693392,693727-693728,696006,697093,706318