Author: jim
Date: Wed Aug 25 14:10:14 2010
New Revision: 989118
URL: http://svn.apache.org/viewvc?rev=989118&view=rev
Log:
Merge r988038 from trunk:
Prevent race condition
See http://www.mail-archive.com/dev@httpd.apache.org/msg47171.html
Submitted by: jfclere
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=989118&r1=989117&r2=989118&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Aug 25 14:10:14 2010
@@ -87,11 +87,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_proxy: Prevent race condition.
- Trunk version of patch:
- http://svn.apache.org/viewvc?view=rev&revision=988038
- +1: jfclere, sf, rpluem, jim
-
*) mod_headers: support global replace in Header Edit
PR 46594 (not 47066 as incorrectly recorded in change log)
trunk: http://svn.eu.apache.org/viewvc?view=revision&revision=894036
Modified: httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c?rev=989118&r1=989117&r2=989118&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Wed Aug 25 14:10:14 2010
@@ -2509,8 +2509,8 @@ PROXY_DECLARE(int) ap_proxy_connect_back
*/
if (!connected && PROXY_WORKER_IS_USABLE(worker) &&
!(worker->s->status & PROXY_WORKER_IGNORE_ERRORS)) {
- worker->s->status |= PROXY_WORKER_IN_ERROR;
worker->s->error_time = apr_time_now();
+ worker->s->status |= PROXY_WORKER_IN_ERROR;
ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
"ap_proxy_connect_backend disabling worker for (%s)",
worker->hostname);
|