You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mt...@apache.org on 2012/02/03 15:15:59 UTC
svn commit: r1240183 -
/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c
Author: mturk
Date: Fri Feb 3 14:15:59 2012
New Revision: 1240183
URL: http://svn.apache.org/viewvc?rev=1240183&view=rev
Log:
Backport fix for PR52402 from trunk
Modified:
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c?rev=1240183&r1=1240182&r2=1240183&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c Fri Feb 3 14:15:59 2012
@@ -737,6 +737,13 @@ 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)",