Mercurial > hg > nginx
changeset 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 | 9ccda889a355 |
children | c93b1c05436c |
files | src/core/ngx_cycle.c src/http/ngx_http.c |
diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_cycle.c Tue Dec 14 19:15:08 2010 +0000 +++ b/src/core/ngx_cycle.c Tue Dec 14 19:19:07 2010 +0000 @@ -847,7 +847,7 @@ 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; }
--- a/src/http/ngx_http.c Tue Dec 14 19:15:08 2010 +0000 +++ b/src/http/ngx_http.c Tue Dec 14 19:19:07 2010 +0000 @@ -1831,8 +1831,12 @@ if (addr[i].hash.buckets == NULL && (addr[i].wc_head == NULL || addr[i].wc_head->hash.buckets == NULL) - && (addr[i].wc_head == NULL - || addr[i].wc_head->hash.buckets == NULL)) + && (addr[i].wc_tail == NULL + || addr[i].wc_tail->hash.buckets == NULL) +#if (NGX_PCRE) + && addr[i].nregex == 0 +#endif + ) { continue; }