Mercurial > hg > nginx-ranges
diff src/http/ngx_http_request.c @ 312:429900ca25ee NGINX_0_6_0
nginx 0.6.0
*) Feature: the "server_name", "map", and "valid_referers" directives
support the "www.example.*" wildcards.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Thu, 14 Jun 2007 00:00:00 +0400 |
parents | 94e16de3c33f |
children | fc223117327f |
line wrap: on
line diff
--- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -1459,19 +1459,10 @@ ngx_http_find_virtual_server(ngx_http_re vn = r->virtual_names; - if (vn->hash.buckets) { - cscf = ngx_hash_find(&vn->hash, hash, host, len); - if (cscf) { - goto found; - } - } - - if (vn->dns_wildcards && vn->dns_wildcards->hash.buckets) { - cscf = ngx_hash_find_wildcard(vn->dns_wildcards, host, len); - - if (cscf) { - goto found; - } + cscf = ngx_hash_find_combined(vn, hash, host, len); + + if (cscf) { + goto found; } cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);