Commit 1c590187 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 3dd7c823

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -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 ]

acinclude.m4

+0 −1
Original line number Diff line number Diff line
@@ -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"

modules/proxy/balancers/config2.m4

+4 −4
Original line number Diff line number Diff line 
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