From 17e19c0098c3a5307fcf9c0eba113b0581f6043b Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Sun, 7 Jul 2013 14:05:37 +0000 Subject: [PATCH] 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 --- modules/proxy/proxy_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 1e435ee154..3a886b897c 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; -- 2.40.0