diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-12-14 10:41:22 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-12-14 10:41:22 +0000 |
| commit | 1db960a374ec3e56e6b117c0e5e877fd75f53922 (patch) | |
| tree | b9ef708ec4baaf8226e43a82dc335a0276ef9837 | |
| parent | 53a398894208a70a6fcbcea78cc5f2ef1727b326 (diff) | |
| download | nginx-1db960a374ec3e56e6b117c0e5e877fd75f53922.tar.gz nginx-1db960a374ec3e56e6b117c0e5e877fd75f53922.zip | |
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
| -rw-r--r-- | src/http/ngx_http.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 4ecd50ce8..9e78ac441 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1870,8 +1870,12 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport, 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; } |