Mercurial > hg > nginx
diff src/core/ngx_cycle.c @ 3837:935c5eb13c7d stable-0.7
merge r3659, r3825, r3826:
IPv6 related fixes:
*) fix IPv6 listen socket handling while reconfiguring
*) test wildcard tail hash existance for IPv6 addresses,
the same fix for IPv4 addresses has been made in r2581
*) always run regex in server_name to get captures for IPv6 addresses,
the same fix for IPv4 addresses has been made in r2584
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 14 Dec 2010 19:19:07 +0000 |
parents | e1409e56ba7c |
children |
line wrap: on
line diff
--- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -847,7 +847,7 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, s sin61 = (struct sockaddr_in6 *) sa1; sin62 = (struct sockaddr_in6 *) sa2; - if (sin61->sin6_port != sin61->sin6_port) { + if (sin61->sin6_port != sin62->sin6_port) { return NGX_DECLINED; }