From: Eric Covener Date: Thu, 4 Nov 2010 22:55:51 +0000 (+0000) Subject: Merge r1031327 from trunk: X-Git-Tag: 2.2.18~323 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a380797221323dbc37066975215eaccc83d626ed;p=thirdparty%2Fapache%2Fhttpd.git Merge r1031327 from trunk: PR#49460: balancer example sets a large loadfactor on the "weak" server. Set loadfactors on both servers, also remove smax= from the example. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1031328 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index bc5dc4f3cb3..22d4755414e 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -1149,9 +1149,9 @@ through <Proxy balancer://mycluster>
BalancerMember ajp://1.2.3.4:8009
- BalancerMember ajp://1.2.3.5:8009 smax=10
- # Less powerful server, don't send as many requests there
- BalancerMember ajp://1.2.3.6:8009 smax=1 loadfactor=20
+ BalancerMember ajp://1.2.3.5:8009 loadfactor=20
+ # Less powerful server, don't send as many requests there,
+ BalancerMember ajp://1.2.3.6:8009 loadfactor=5
 </Proxy>

diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index 7b5d37f104d..50e0f9dbbeb 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -997,9 +997,9 @@ expressions <Proxy balancer://mycluster>
BalancerMember ajp://1.2.3.4:8009
- BalancerMember ajp://1.2.3.5:8009 smax=10
- # Less powerful server, don't send as many requests there
- BalancerMember ajp://1.2.3.6:8009 smax=1 loadfactor=20
+ BalancerMember ajp://1.2.3.5:8009 loadfactor=20
+ # Less powerful server, don't send as many requests there,
+ BalancerMember ajp://1.2.3.6:8009 loadfactor=5
 </Proxy>