diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-11-07 13:39:53 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-11-07 13:39:53 +0000 |
| commit | c2378f80289ead8157c63ac6216836bab6e4294b (patch) | |
| tree | dd8b8a62c7a4ec8c5207a3f83d463d9ba86e62e8 /src/http/ngx_http_request.c | |
| parent | 042aaba551f42c6e1af0ce6f3ab1681b88268f40 (diff) | |
| download | nginx-c2378f80289ead8157c63ac6216836bab6e4294b.tar.gz nginx-c2378f80289ead8157c63ac6216836bab6e4294b.tar.bz2 | |
r1254, r1416, r1493 merge:
the "www.example.*" wildcard hash support
Diffstat (limited to 'src/http/ngx_http_request.c')
| -rw-r--r-- | src/http/ngx_http_request.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index c60f2e55d..bc7a92fcc 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -1463,19 +1463,10 @@ ngx_http_find_virtual_server(ngx_http_request_t *r, u_char *host, size_t len, vn = r->virtual_names; - if (vn->hash.buckets) { - cscf = ngx_hash_find(&vn->hash, hash, host, len); - if (cscf) { - goto found; - } - } + cscf = ngx_hash_find_combined(vn, hash, host, len); - if (vn->dns_wildcards && vn->dns_wildcards->hash.buckets) { - cscf = ngx_hash_find_wildcard(vn->dns_wildcards, host, len); - - if (cscf) { - goto found; - } + if (cscf) { + goto found; } cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); |