From b7d2b97fd0e3fe02d72c5057d0daad28ed1ce8c1 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 25 Aug 2010 14:10:14 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@989118 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 5 ----- modules/proxy/proxy_util.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/STATUS b/STATUS index bf2b644f14f..cf505635dfe 100644 --- a/STATUS +++ b/STATUS @@ -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 diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index a70a8758b07..95f4a784fce 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -2509,8 +2509,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); -- 2.47.2