]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
conf->mutex is not used... Also, ensure that pool
authorJim Jagielski <jim@apache.org>
Sun, 7 Jul 2013 14:05:37 +0000 (14:05 +0000)
committerJim Jagielski <jim@apache.org>
Sun, 7 Jul 2013 14:05:37 +0000 (14:05 +0000)
use is protected

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

modules/proxy/proxy_util.c

index 1e435ee15448f2bf7de13abf0f0382663ffe11f3..3a886b897c115033707ae79cdd71a32a3f38dc41 100644 (file)
@@ -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;