From: Jean-Frederic Clere <jfclere@apache.org>
Date: Mon, 23 Aug 2010 09:09:25 +0000 (+0000)
Subject: Prevent race condition
X-Git-Tag: 2.3.8~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8cf7c21e5e1431f078e5a0d74c174ecbab498d6;p=apache

Prevent race condition
See http://www.mail-archive.com/dev@httpd.apache.org/msg47171.html


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@988038 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 74e7da96a6..d6e1ea6d18 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -2587,8 +2587,8 @@ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
      */
     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);