httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r768503 - in /httpd/httpd/branches/2.2.x: STATUS modules/proxy/mod_proxy_balancer.c
Date Sat, 25 Apr 2009 09:43:39 GMT
Author: rpluem
Date: Sat Apr 25 09:43:38 2009
New Revision: 768503

URL: http://svn.apache.org/viewvc?rev=768503&view=rev
Log:
* Correct logic with non-seq lbsets config'ed

Submitted by: jim
Reviewed by: jim, rpluem, jfclere

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=768503&r1=768502&r2=768503&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Apr 25 09:43:38 2009
@@ -97,16 +97,6 @@
      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:

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c?rev=768503&r1=768502&r2=768503&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c Sat Apr 25 09:43:38 2009
@@ -1014,7 +1014,7 @@
                     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 @@
                     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 @@
                         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))
)



Mime
View raw message