From: Igor Sysoev <igor@sysoev.ru>
Date: Thu, 20 Nov 2008 17:16:39 +0000 (+0000)
Subject: r2205 merge:
X-Git-Tag: release-0.6.33~5
X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=abb54176a2e3ffd84fcbb50735dcb14b3c97f389;p=nginx.git

r2205 merge:

fix divide by zero if max_fails=0
---

diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c
index 062137158..c6541a33c 100644
--- a/src/http/ngx_http_upstream_round_robin.c
+++ b/src/http/ngx_http_upstream_round_robin.c
@@ -645,7 +645,9 @@ ngx_http_upstream_free_round_robin_peer(ngx_peer_connection_t *pc, void *data,
         peer->fails++;
         peer->accessed = now;
 
-        peer->current_weight -= peer->weight / peer->max_fails;
+        if (peer->max_fails) {
+            peer->current_weight -= peer->weight / peer->max_fails;
+        }
 
         ngx_log_debug2(NGX_LOG_DEBUG_HTTP, pc->log, 0,
                        "free rr peer failed: %ui %i",