httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r724367 - in /httpd/httpd/trunk/modules/proxy: balancers/WHERE_IS_CONFIG_M4.txt balancers/config2.m4 config.m4
Date Mon, 08 Dec 2008 14:51:51 GMT
Author: jim
Date: Mon Dec  8 06:51:50 2008
New Revision: 724367

URL: http://svn.apache.org/viewvc?rev=724367&view=rev
Log:
OK, instead of an igly hack, just use the normal
build system impl to force balancer's config to
happen post proxy 

Added:
    httpd/httpd/trunk/modules/proxy/balancers/config2.m4   (with props)
Removed:
    httpd/httpd/trunk/modules/proxy/balancers/WHERE_IS_CONFIG_M4.txt
Modified:
    httpd/httpd/trunk/modules/proxy/config.m4

Added: httpd/httpd/trunk/modules/proxy/balancers/config2.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/balancers/config2.m4?rev=724367&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/proxy/balancers/config2.m4 (added)
+++ httpd/httpd/trunk/modules/proxy/balancers/config2.m4 Mon Dec  8 06:51:50 2008
@@ -0,0 +1,20 @@
+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

Propchange: httpd/httpd/trunk/modules/proxy/balancers/config2.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/trunk/modules/proxy/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/config.m4?rev=724367&r1=724366&r2=724367&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/config.m4 (original)
+++ httpd/httpd/trunk/modules/proxy/config.m4 Mon Dec  8 06:51:50 2008
@@ -80,24 +80,3 @@
 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



Mime
View raw message