commit 3625a458d9a29943aa7891296ef2dd3e9933f9a8
author Igor Sysoev <igor@sysoev.ru> Tue Aug 07 12:34:20 2007 +0000
committer Igor Sysoev <igor@sysoev.ru> Tue Aug 07 12:34:20 2007 +0000
tree 66eb88effa421ca5088e0546347ab1d67111ae2b
parent c92483b948ddbfb45ce767bdb0aad597aac15243

"down" server caused endless loop

src/http/ngx_http_upstream_round_robin.c

diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index 6756d2b..73896fc 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -48,11 +48,11 @@
                 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++;
             }
         }