Mercurial > hg > nginx

changeset 1376:6ff8c0c1e194

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"down" server caused endless loop
author Igor Sysoev <igor@sysoev.ru>
date Tue, 07 Aug 2007 12:34:20 +0000
parents 8d7120543619
children 0d57c150115b
files src/http/ngx_http_upstream_round_robin.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -48,11 +48,11 @@ ngx_http_upstream_init_round_robin(ngx_c
                 peers->peer[n].sockaddr = server[i].addrs[j].sockaddr;
                 peers->peer[n].socklen = server[i].addrs[j].socklen;
                 peers->peer[n].name = server[i].addrs[j].name;
-                peers->peer[n].weight = server[i].weight;
-                peers->peer[n].current_weight = server[i].weight;
                 peers->peer[n].max_fails = server[i].max_fails;
                 peers->peer[n].fail_timeout = server[i].fail_timeout;
                 peers->peer[n].down = server[i].down;
+                peers->peer[n].weight = server[i].down ? 0 : server[i].weight;
+                peers->peer[n].current_weight = peers->peer[n].weight;
                 n++;
             }
         }