From 816d8b11cd0879aadb1925984a16990f37526464 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Wed, 29 Jun 2016 17:30:07 +0000 Subject: [PATCH] Merge r1750507, r1750553 from trunk: Fix proxy balancer lbmethod --enable defaults to follow proxy_balancer Small change to r952007, ensure we don't wipe out the $enable_foomod value when that value is 'shared'. The 'yes', 'shared', 'static' and 'no' values are all valid. Submitted by: wrowe Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1750684 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 7 ------- acinclude.m4 | 1 - modules/proxy/balancers/config2.m4 | 8 ++++---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/STATUS b/STATUS index 783a93ac87..9dbf8cb272 100644 --- a/STATUS +++ b/STATUS @@ -117,13 +117,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) lbmethod(s): Fix proxy balancer lbmethod --enable defaults - to follow proxy_balancer - trunk patch: http://svn.apache.org/r1750507 - http://svn.apache.org/r1750553 - 2.4.x: trunk patch works - +1: wrowe, rpluem, jim - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/acinclude.m4 b/acinclude.m4 index 6d8dcb019b..bbe6d5cd7b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -396,7 +396,6 @@ AC_DEFUN([APACHE_MODULE],[ fi shared="";; *) - enable_$1=`echo $enable_$1|sed 's/shared,*//'` sharedobjs=yes shared=yes DSO_MODULES="$DSO_MODULES $1" diff --git a/modules/proxy/balancers/config2.m4 b/modules/proxy/balancers/config2.m4 index f7232661a8..f6372815d6 100644 --- a/modules/proxy/balancers/config2.m4 +++ b/modules/proxy/balancers/config2.m4 @@ -1,8 +1,8 @@ APACHE_MODPATH_INIT(proxy/balancers) -APACHE_MODULE(lbmethod_byrequests, Apache proxy Load balancing by request counting, , , $proxy_mods_enable) -APACHE_MODULE(lbmethod_bytraffic, Apache proxy Load balancing by traffic counting, , , $proxy_mods_enable) -APACHE_MODULE(lbmethod_bybusyness, Apache proxy Load balancing by busyness, , , $proxy_mods_enable) -APACHE_MODULE(lbmethod_heartbeat, Apache proxy Load balancing from Heartbeats, , , $proxy_mods_enable) +APACHE_MODULE(lbmethod_byrequests, Apache proxy Load balancing by request counting, , , $enable_proxy_balancer, , proxy_balancer) +APACHE_MODULE(lbmethod_bytraffic, Apache proxy Load balancing by traffic counting, , , $enable_proxy_balancer, , proxy_balancer) +APACHE_MODULE(lbmethod_bybusyness, Apache proxy Load balancing by busyness, , , $enable_proxy_balancer, , proxy_balancer) +APACHE_MODULE(lbmethod_heartbeat, Apache proxy Load balancing from Heartbeats, , , $enable_proxy_balancer, , proxy_balancer) APACHE_MODPATH_FINISH -- 2.40.0