You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jf...@apache.org on 2010/08/23 11:09:26 UTC
svn commit: r988038 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
Author: jfclere
Date: Mon Aug 23 09:09:25 2010
New Revision: 988038
URL: http://svn.apache.org/viewvc?rev=988038&view=rev
Log:
Prevent race condition
See http://www.mail-archive.com/dev@httpd.apache.org/msg47171.html
Modified:
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=988038&r1=988037&r2=988038&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Mon Aug 23 09:09:25 2010
@@ -2587,8 +2587,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);