Mercurial > hg > nginx
comparison 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 |
comparison
equal
deleted
inserted
replaced
3836:9ccda889a355 | 3837:935c5eb13c7d |
---|---|
845 #if (NGX_HAVE_INET6) | 845 #if (NGX_HAVE_INET6) |
846 case AF_INET6: | 846 case AF_INET6: |
847 sin61 = (struct sockaddr_in6 *) sa1; | 847 sin61 = (struct sockaddr_in6 *) sa1; |
848 sin62 = (struct sockaddr_in6 *) sa2; | 848 sin62 = (struct sockaddr_in6 *) sa2; |
849 | 849 |
850 if (sin61->sin6_port != sin61->sin6_port) { | 850 if (sin61->sin6_port != sin62->sin6_port) { |
851 return NGX_DECLINED; | 851 return NGX_DECLINED; |
852 } | 852 } |
853 | 853 |
854 if (ngx_memcmp(&sin61->sin6_addr, &sin62->sin6_addr, 16) != 0) { | 854 if (ngx_memcmp(&sin61->sin6_addr, &sin62->sin6_addr, 16) != 0) { |
855 return NGX_DECLINED; | 855 return NGX_DECLINED; |