diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2014-03-07 15:17:38 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2014-03-07 15:17:38 +0400 |
| commit | 8800f0c42bdeb45af201118c8461538e73ceb723 (patch) | |
| tree | b15e51a18db1012cad9dbed81dc154c2db5356ab /src | |
| parent | 3dddf60850731ff7cd340d2b52e65410ed635868 (diff) | |
| download | nginx-8800f0c42bdeb45af201118c8461538e73ceb723.tar.gz nginx-8800f0c42bdeb45af201118c8461538e73ceb723.zip | |
Core: fixed wrong indices in listening sockets compare loops.
Proper use is "ls[i]" and "nls[n]". Previous code used it wrong in
several places, likely due to cut-n-paste errors.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_cycle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 86ed9a6da..d1a89ae1a 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -494,14 +494,14 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) } if (ngx_cmp_sockaddr(nls[n].sockaddr, nls[n].socklen, - ls[i].sockaddr, ls[n].socklen, 1) + ls[i].sockaddr, ls[i].socklen, 1) == NGX_OK) { nls[n].fd = ls[i].fd; nls[n].previous = &ls[i]; ls[i].remain = 1; - if (ls[n].backlog != nls[i].backlog) { + if (ls[i].backlog != nls[n].backlog) { nls[n].listen = 1; } @@ -532,7 +532,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) - if (ls[n].deferred_accept && !nls[n].deferred_accept) { + if (ls[i].deferred_accept && !nls[n].deferred_accept) { nls[n].delete_deferred = 1; } else if (ls[i].deferred_accept != nls[n].deferred_accept) |