Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ACAA79664 for ; Fri, 3 Feb 2012 14:16:21 +0000 (UTC) Received: (qmail 80720 invoked by uid 500); 3 Feb 2012 14:16:21 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 80638 invoked by uid 500); 3 Feb 2012 14:16:20 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 80631 invoked by uid 99); 3 Feb 2012 14:16:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2012 14:16:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2012 14:16:19 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E9EB62388865; Fri, 3 Feb 2012 14:15:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1240183 - /httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_balancer.c Date: Fri, 03 Feb 2012 14:15:59 -0000 To: cvs@httpd.apache.org From: mturk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120203141559.E9EB62388865@eris.apache.org> 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)",