Mercurial > hg > nginx-vendor-1-0
diff src/http/ngx_http.c @ 610:7ea1bba9a4f6 NGINX_0_9_3
nginx 0.9.3
*) Bugfix: if there was a single server for given IPv6 address:port
pair, then captures in regular expressions in a "server_name"
directive did not work.
*) Bugfix: nginx could not be built on Solaris; the bug had appeared in
0.9.0.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 13 Dec 2010 00:00:00 +0300 |
parents | 5dc296c4372a |
children | 692f4d4d7f10 |
line wrap: on
line diff
--- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1502,7 +1502,7 @@ ngx_http_server_names(ngx_conf_t *cf, ng } if (rc == NGX_BUSY) { - ngx_log_error(NGX_LOG_WARN, cf->log, 0, + ngx_log_error(NGX_LOG_WARN, cf->log, 0, "conflicting server name \"%V\" on %s, ignored", &name[n].name, addr->opt.addr); } @@ -1870,8 +1870,12 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_ 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; }