httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1240181 - /httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
Date Fri, 03 Feb 2012 14:13:23 GMT
Author: mturk
Date: Fri Feb  3 14:13:23 2012
New Revision: 1240181

URL: http://svn.apache.org/viewvc?rev=1240181&view=rev
Log:
Fix PR52402. Check if the shared memory was already created for this proxy_server_conf

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=1240181&r1=1240180&r2=1240181&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Fri Feb  3 14:13:23 2012
@@ -737,6 +737,12 @@ static int balancer_post_config(apr_pool
         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)",



Mime
View raw message