Mercurial > hg > nginx
comparison 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 |
comparison
equal
deleted
inserted
replaced
3836:9ccda889a355 | 3837:935c5eb13c7d |
---|---|
1829 #endif | 1829 #endif |
1830 | 1830 |
1831 if (addr[i].hash.buckets == NULL | 1831 if (addr[i].hash.buckets == NULL |
1832 && (addr[i].wc_head == NULL | 1832 && (addr[i].wc_head == NULL |
1833 || addr[i].wc_head->hash.buckets == NULL) | 1833 || addr[i].wc_head->hash.buckets == NULL) |
1834 && (addr[i].wc_head == NULL | 1834 && (addr[i].wc_tail == NULL |
1835 || addr[i].wc_head->hash.buckets == NULL)) | 1835 || addr[i].wc_tail->hash.buckets == NULL) |
1836 #if (NGX_PCRE) | |
1837 && addr[i].nregex == 0 | |
1838 #endif | |
1839 ) | |
1836 { | 1840 { |
1837 continue; | 1841 continue; |
1838 } | 1842 } |
1839 | 1843 |
1840 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); | 1844 vn = ngx_palloc(cf->pool, sizeof(ngx_http_virtual_names_t)); |