From: Ruediger Pluem Date: Sat, 25 Apr 2009 09:43:38 +0000 (+0000) Subject: * Correct logic with non-seq lbsets config'ed X-Git-Tag: 2.2.12~158 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48eca05192f425be01a94a72f9fa88f6d27119d4;p=thirdparty%2Fapache%2Fhttpd.git * Correct logic with non-seq lbsets config'ed Submitted by: jim Reviewed by: jim, rpluem, jfclere git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@768503 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 46e03bad811..246fea3e400 100644 --- a/STATUS +++ b/STATUS @@ -97,16 +97,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: Trunk version of patch works +1: rpluem, wrowe, jfclere - * mod_proxy_balancer: Fix handling of lbset for non-seq config'ed - clusters: - Trunk version of patch: - http://svn.apache.org/viewvc?view=rev&revision=739852 - http://svn.apache.org/viewvc?view=rev&revision=739853 - http://svn.apache.org/viewvc?view=rev&revision=739854 - Backport version for 2.2.x of patch: - http://people.apache.org/~jim/patches/httpd-2.2-lbset.patch - +1: jim, rpluem, jfclere - * mod_ssl: Add SSLProxyCheckPeerExpire and SSLProxyCheckPeerCN directives to enable stricter checking of remote server certificates. Trunk version of patch: diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c index 01b0566b11c..e5a010dbd8b 100644 --- a/modules/proxy/mod_proxy_balancer.c +++ b/modules/proxy/mod_proxy_balancer.c @@ -1014,7 +1014,7 @@ static proxy_worker *find_best_byrequests(proxy_balancer *balancer, if (worker->s->lbset > max_lbset) max_lbset = worker->s->lbset; } - if (worker->s->lbset > cur_lbset) + if (worker->s->lbset != cur_lbset) continue; if ( (checking_standby ? !PROXY_WORKER_IS_STANDBY(worker) : PROXY_WORKER_IS_STANDBY(worker)) ) continue; @@ -1096,7 +1096,7 @@ static proxy_worker *find_best_bytraffic(proxy_balancer *balancer, if (worker->s->lbset > max_lbset) max_lbset = worker->s->lbset; } - if (worker->s->lbset > cur_lbset) + if (worker->s->lbset != cur_lbset) continue; if ( (checking_standby ? !PROXY_WORKER_IS_STANDBY(worker) : PROXY_WORKER_IS_STANDBY(worker)) ) continue; @@ -1166,7 +1166,7 @@ static proxy_worker *find_best_bybusyness(proxy_balancer *balancer, max_lbset = worker->s->lbset; } - if (worker->s->lbset > cur_lbset) + if (worker->s->lbset != cur_lbset) continue; if ( (checking_standby ? !PROXY_WORKER_IS_STANDBY(worker) : PROXY_WORKER_IS_STANDBY(worker)) )