Mercurial > hg > nginx
diff src/http/ngx_http.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 | 616ff375a68f |
children |
line wrap: on
line diff
--- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1831,8 +1831,12 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_ 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; }