From: Jim Jagielski <jim@apache.org>
Date: Sun, 7 Jul 2013 14:05:37 +0000 (+0000)
Subject: conf->mutex is not used... Also, ensure that pool
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf100dfde2697041099b4a0e42eeb22baf893642;p=thirdparty%2Fapache%2Fhttpd.git

conf->mutex is not used... Also, ensure that pool
use is protected


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

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 1e435ee1544..3a886b897c1 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -2900,10 +2900,10 @@ PROXY_DECLARE(apr_status_t) ap_proxy_sync_balancer(proxy_balancer *b, server_rec
         }
         if (!found) {
             proxy_worker **runtime;
+            apr_global_mutex_lock(proxy_mutex);
             runtime = apr_array_push(b->workers);
-            apr_global_mutex_lock(conf->mutex);
             *runtime = apr_palloc(conf->pool, sizeof(proxy_worker));
-            apr_global_mutex_unlock(conf->mutex);
+            apr_global_mutex_unlock(proxy_mutex);
             (*runtime)->hash = shm->hash;
             (*runtime)->context = NULL;
             (*runtime)->cp = NULL;