mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add guard code to prevent endless loop

Browse Source
This commit is contained in:
Igor Sysoev 2007-08-24 15:58:13 +00:00
parent 97e9336753
commit 012f231bbc
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/http/ngx_http_upstream_round_robin.c
View File

@ -303,6 +303,8 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
/* it's a first try - get a current peer */ /* it's a first try - get a current peer */
i = pc->tries;
for ( ;; ) { for ( ;; ) {
rrp->current = ngx_http_upstream_get_peer(rrp->peers); rrp->current = ngx_http_upstream_get_peer(rrp->peers);
@ -339,16 +341,24 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
pc->tries--; pc->tries--;
} }
if (pc->tries) { if (pc->tries == 0) {
continue; goto failed;
} }
goto failed; if (--i == 0) {
ngx_log_error(NGX_LOG_ALERT, pc->log, 0,
"round robin upstream stuck on %ui tries",
pc->tries);
goto failed;
}
} }
peer->current_weight--; peer->current_weight--;
} else { } else {
i = pc->tries;
for ( ;; ) { for ( ;; ) {
n = rrp->current / (8 * sizeof(uintptr_t)); n = rrp->current / (8 * sizeof(uintptr_t));
m = (uintptr_t) 1 << rrp->current % (8 * sizeof(uintptr_t)); m = (uintptr_t) 1 << rrp->current % (8 * sizeof(uintptr_t));
@ -385,11 +395,16 @@ ngx_http_upstream_get_round_robin_peer(ngx_peer_connection_t *pc, void *data)
rrp->current = 0; rrp->current = 0;
} }
if (pc->tries) { if (pc->tries == 0) {
continue; goto failed;
} }
goto failed; if (--i == 0) {
ngx_log_error(NGX_LOG_ALERT, pc->log, 0,
"round robin upstream stuck on %ui tries",
pc->tries);
goto failed;
}
} }
peer->current_weight--; peer->current_weight--;