]> granicus.if.org Git - apache/commitdiff
Backport fix for PR52402 from trunk
authorMladen Turk <mturk@apache.org>
Fri, 3 Feb 2012 14:15:59 +0000 (14:15 +0000)
committerMladen Turk <mturk@apache.org>
Fri, 3 Feb 2012 14:15:59 +0000 (14:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1240183 13f79535-47bb-0310-9956-ffa450edef68

modules/proxy/mod_proxy_balancer.c

index 01247ff44a20cf9f879cc9cf14f547b4e2876d06..08417d656da1bedf1c3adfedcd63bc15873c9978 100644 (file)
@@ -737,6 +737,13 @@ static int balancer_post_config(apr_pool_t *pconf, apr_pool_t *plog,
         sconf = s->module_config;
         conf = (proxy_server_conf *)ap_get_module_config(sconf, &proxy_module);
 
+        if (conf->bslot) {
+            /* Shared memory already created for this proxy_server_conf.
+             */
+            s = s->next;
+            continue;
+        }
+
         if (conf->balancers->nelts) {
             conf->max_balancers = conf->balancers->nelts + conf->bgrowth;
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01178) "Doing balancers create: %d, %d (%d)",