IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge r3825, r3826:

Browse Source 
*) 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
This commit is contained in:
Igor Sysoev 2010-12-14 10:41:22 +00:00
parent 53a3988942
commit 1db960a374
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/http/ngx_http.c
View File

@ -1870,8 +1870,12 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
if (addr[i].hash.buckets == NULL if (addr[i].hash.buckets == NULL
&& (addr[i].wc_head == NULL && (addr[i].wc_head == NULL
|| addr[i].wc_head->hash.buckets == NULL) || addr[i].wc_head->hash.buckets == NULL)
&& (addr[i].wc_head == NULL && (addr[i].wc_tail == NULL
|| addr[i].wc_head->hash.buckets == NULL)) || addr[i].wc_tail->hash.buckets == NULL)
#if (NGX_PCRE)
&& addr[i].nregex == 0
#endif
)
{ {
continue; continue;
} }