mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-02 20:09:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: fixed wrong indices in listening sockets compare loops.

Browse Source 
Proper use is "ls[i]" and "nls[n]".  Previous code used it wrong in
several places, likely due to cut-n-paste errors.
This commit is contained in:
Maxim Dounin 2014-03-07 15:17:38 +04:00
parent 3dddf60850
commit 8800f0c42b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/ngx_cycle.c
View File

@ -494,14 +494,14 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
} }
if (ngx_cmp_sockaddr(nls[n].sockaddr, nls[n].socklen, 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) == NGX_OK)
{ {
nls[n].fd = ls[i].fd; nls[n].fd = ls[i].fd;
nls[n].previous = &ls[i]; nls[n].previous = &ls[i];
ls[i].remain = 1; ls[i].remain = 1;
if (ls[n].backlog != nls[i].backlog) { if (ls[i].backlog != nls[n].backlog) {
nls[n].listen = 1; 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 (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; nls[n].delete_deferred = 1;
} else if (ls[i].deferred_accept != nls[n].deferred_accept) } else if (ls[i].deferred_accept != nls[n].deferred_accept)