Mercurial > hg > nginx

comparison src/core/ngx_cycle.c @ 5603:b2b5b1b74129

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 07 Mar 2014 15:17:38 +0400
parents d39ef821d03e
children dfb3c15bc851
comparison
equal deleted inserted replaced
5602:b799b9d62c45 5603:b2b5b1b74129
492 if (ls[i].ignore) { 492 if (ls[i].ignore) {
493 continue; 493 continue;
494 } 494 }
495 495
496 if (ngx_cmp_sockaddr(nls[n].sockaddr, nls[n].socklen, 496 if (ngx_cmp_sockaddr(nls[n].sockaddr, nls[n].socklen,
497 ls[i].sockaddr, ls[n].socklen, 1) 497 ls[i].sockaddr, ls[i].socklen, 1)
498 == NGX_OK) 498 == NGX_OK)
499 { 499 {
500 nls[n].fd = ls[i].fd; 500 nls[n].fd = ls[i].fd;
501 nls[n].previous = &ls[i]; 501 nls[n].previous = &ls[i];
502 ls[i].remain = 1; 502 ls[i].remain = 1;
503 503
504 if (ls[n].backlog != nls[i].backlog) { 504 if (ls[i].backlog != nls[n].backlog) {
505 nls[n].listen = 1; 505 nls[n].listen = 1;
506 } 506 }
507 507
508 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER) 508 #if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
509 509
530 } 530 }
531 #endif 531 #endif
532 532
533 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) 533 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
534 534
535 if (ls[n].deferred_accept && !nls[n].deferred_accept) { 535 if (ls[i].deferred_accept && !nls[n].deferred_accept) {
536 nls[n].delete_deferred = 1; 536 nls[n].delete_deferred = 1;
537 537
538 } else if (ls[i].deferred_accept != nls[n].deferred_accept) 538 } else if (ls[i].deferred_accept != nls[n].deferred_accept)
539 { 539 {
540 nls[n].add_deferred = 1; 540 nls[n].add_deferred = 1;