From eb3b8d452600ff504442edfade7e18c589187e08 Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Fri, 16 Jul 2021 16:18:44 +0000 Subject: [PATCH] Follow-up to r1891477. Axe a few lines of code and document a potential optimization git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1891591 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/proxy_util.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index f6bab191fe..03b6d848a4 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -3677,17 +3677,15 @@ PROXY_DECLARE(apr_status_t) ap_proxy_sync_balancer(proxy_balancer *b, server_rec } if (!found) { proxy_worker **runtime; + /* XXX: a thread mutex is maybe enough here */ apr_global_mutex_lock(proxy_mutex); runtime = apr_array_push(b->workers); - *runtime = apr_palloc(conf->pool, sizeof(proxy_worker)); + *runtime = apr_pcalloc(conf->pool, sizeof(proxy_worker)); apr_global_mutex_unlock(proxy_mutex); - memset(*runtime, 0, sizeof(proxy_worker)); (*runtime)->hash = shm->hash; (*runtime)->balancer = b; (*runtime)->s = shm; -#if APR_HAS_THREADS - (*runtime)->tmutex = NULL; -#endif + rv = ap_proxy_initialize_worker(*runtime, s, conf->pool); if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_EMERG, rv, s, APLOGNO(00966) "Cannot init worker");