You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2006/08/03 13:41:14 UTC
svn commit: r428361 - /httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
Author: jim
Date: Thu Aug 3 04:41:14 2006
New Revision: 428361
URL: http://svn.apache.org/viewvc?rev=428361&view=rev
Log:
Initialization change. Move to a different format
to force resets as well as a common technique, in case
_route is updated at some point.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c?rev=428361&r1=428360&r2=428361&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_balancer.c Thu Aug 3 04:41:14 2006
@@ -180,10 +180,12 @@
const char *route, request_rec *r)
{
int i;
- int checking_standby = 0;
- int checked_standby = 0;
+ int checking_standby;
+ int checked_standby;
proxy_worker *worker;
+
+ checking_standby = checked_standby = 0;
while (!checked_standby) {
worker = (proxy_worker *)balancer->workers->elts;
for (i = 0; i < balancer->workers->nelts; i++, worker++) {
@@ -878,6 +880,8 @@
proxy_worker *mycandidate = NULL;
int cur_lbset = 0;
int max_lbset = 0;
+ int checking_standby;
+ int checked_standby;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"proxy: Entering byrequests for BALANCER (%s)",
@@ -885,8 +889,7 @@
/* First try to see if we have available candidate */
do {
- int checking_standby = 0;
- int checked_standby = 0;
+ checking_standby = checked_standby = 0;
while (!mycandidate && !checked_standby) {
worker = (proxy_worker *)balancer->workers->elts;
for (i = 0; i < balancer->workers->nelts; i++, worker++) {
@@ -956,6 +959,8 @@
proxy_worker *mycandidate = NULL;
int cur_lbset = 0;
int max_lbset = 0;
+ int checking_standby;
+ int checked_standby;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"proxy: Entering bytraffic for BALANCER (%s)",
@@ -963,8 +968,7 @@
/* First try to see if we have available candidate */
do {
- int checking_standby = 0;
- int checked_standby = 0;
+ checking_standby = checked_standby = 0;
while (!mycandidate && !checked_standby) {
worker = (proxy_worker *)balancer->workers->elts;
for (i = 0; i < balancer->workers->nelts; i++, worker++) {