details: http://hg.nginx.org/nginx/rev/b2b5b1b74129
branches:
changeset: 5603:b2b5b1b74129
user: Maxim Dounin <mdounin@mdounin.ru>
date: Fri Mar 07 15:17:38 2014 +0400
description:
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:

src/core/ngx_cycle.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diffs (29 lines):

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
--- 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)

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel