Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 1617:cacb565c554e stable-0.5
r1254, r1416, r1493 merge:
the "www.example.*" wildcard hash support
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 07 Nov 2007 13:39:53 +0000 |
parents | d5db0e96bcc6 |
children | fbf94b8341bf |
comparison
equal
deleted
inserted
replaced
1615:ca6845b19113 | 1617:cacb565c554e |
---|---|
1461 ngx_http_core_loc_conf_t *clcf; | 1461 ngx_http_core_loc_conf_t *clcf; |
1462 ngx_http_core_srv_conf_t *cscf; | 1462 ngx_http_core_srv_conf_t *cscf; |
1463 | 1463 |
1464 vn = r->virtual_names; | 1464 vn = r->virtual_names; |
1465 | 1465 |
1466 if (vn->hash.buckets) { | 1466 cscf = ngx_hash_find_combined(vn, hash, host, len); |
1467 cscf = ngx_hash_find(&vn->hash, hash, host, len); | 1467 |
1468 if (cscf) { | 1468 if (cscf) { |
1469 goto found; | 1469 goto found; |
1470 } | |
1471 } | |
1472 | |
1473 if (vn->dns_wildcards && vn->dns_wildcards->hash.buckets) { | |
1474 cscf = ngx_hash_find_wildcard(vn->dns_wildcards, host, len); | |
1475 | |
1476 if (cscf) { | |
1477 goto found; | |
1478 } | |
1479 } | 1470 } |
1480 | 1471 |
1481 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); | 1472 cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module); |
1482 | 1473 |
1483 if (cscf->wildcard) { | 1474 if (cscf->wildcard) { |