Mercurial > hg > nginx
changeset 3832:db5bfb61ef9c stable-0.8
merge r3825, r3826:
*) 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 10:41:22 +0000 |
parents | 159a513d42fa |
children | ddb0727e51db |
files | src/http/ngx_http.c |
diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http.c Tue Dec 14 10:38:42 2010 +0000 +++ b/src/http/ngx_http.c Tue Dec 14 10:41:22 2010 +0000 @@ -1870,8 +1870,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; }