Mercurial > hg > nginx
comparison src/http/ngx_http.c @ 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 | 098cd8119861 |
children |
comparison
equal
deleted
inserted
replaced
3831:159a513d42fa | 3832:db5bfb61ef9c |
---|---|
1868 #endif | 1868 #endif |
1869 | 1869 |
1870 if (addr[i].hash.buckets == NULL | 1870 if (addr[i].hash.buckets == NULL |
1871 && (addr[i].wc_head == NULL | 1871 && (addr[i].wc_head == NULL |
1872 || addr[i].wc_head->hash.buckets == NULL) | 1872 || addr[i].wc_head->hash.buckets == NULL) |
1873 && (addr[i].wc_head == NULL | 1873 && (addr[i].wc_tail == NULL |
1874 || addr[i].wc_head->hash.buckets == NULL)) | 1874 || addr[i].wc_tail->hash.buckets == NULL) |
1875 #if (NGX_PCRE) | |
1876 && addr[i].nregex == 0 | |
1877 #endif | |
1878 ) | |
1875 { | 1879 { |
1876 continue; | 1880 continue; |
1877 } | 1881 } |
1878 | 1882 |
1879 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); | 1883 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); |