Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 19435 invoked from network); 8 Dec 2008 14:28:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Dec 2008 14:28:55 -0000 Received: (qmail 37979 invoked by uid 500); 8 Dec 2008 14:29:05 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 37935 invoked by uid 500); 8 Dec 2008 14:29:05 -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 37805 invoked by uid 99); 8 Dec 2008 14:29:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 06:29:03 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 08 Dec 2008 14:27:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 18DAE238893B; Mon, 8 Dec 2008 06:28:29 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r724358 - in /httpd/httpd/trunk/modules/proxy: balancers/config.m4 config.m4 Date: Mon, 08 Dec 2008 14:28:28 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081208142829.18DAE238893B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Mon Dec 8 06:28:28 2008 New Revision: 724358 URL: http://svn.apache.org/viewvc?rev=724358&view=rev Log: Force the lbmethod submodules to be loaded AFTER mod_proxy. Removed: httpd/httpd/trunk/modules/proxy/balancers/config.m4 Modified: httpd/httpd/trunk/modules/proxy/config.m4 Modified: httpd/httpd/trunk/modules/proxy/config.m4 URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/config.m4?rev=724358&r1=724357&r2=724358&view=diff ============================================================================== --- httpd/httpd/trunk/modules/proxy/config.m4 (original) +++ httpd/httpd/trunk/modules/proxy/config.m4 Mon Dec 8 06:28:28 2008 @@ -79,3 +79,25 @@ APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current/../generators]) APACHE_MODPATH_FINISH + + +APACHE_MODPATH_INIT(proxy/balancers) +if test "$enable_proxy" = "shared"; then + proxy_mods_enable=shared +elif test "$enable_proxy" = "yes"; then + proxy_mods_enable=yes +else + proxy_mods_enable=no +fi + +proxy_lb_br_objs="mod_lbmethod_byrequests.lo" +proxy_lb_bt_objs="mod_lbmethod_bytraffic.lo" +proxy_lb_bb_objs="mod_lbmethod_bybusyness.lo" +proxy_lb_hb_objs="mod_lbmethod_heartbeat.lo" + +APACHE_MODULE(lbmethod_byrequests, Apache proxy Load balancing by request counting, $proxy_lb_br_objs, , $proxy_mods_enable) +APACHE_MODULE(lbmethod_bytraffic, Apache proxy Load balancing by traffic counting, $proxy_lb_bt_objs, , $proxy_mods_enable) +APACHE_MODULE(lbmethod_bybusyness, Apache proxy Load balancing by busyness, $proxy_lb_bb_objs, , $proxy_mods_enable) +APACHE_MODULE(lbmethod_heartbeat, Apache proxy Load balancing from Heartbeats, $proxy_lb_hb_objs, , $proxy_mods_enable) + +APACHE_MODPATH_FINISH