Mercurial > hg > nginx
changeset 2583:1fb5e7e05a4e
always run regex in server_name to get captures
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 19 Mar 2009 16:07:40 +0000 |
parents | 2068bdecc876 |
children | 91e287d78d90 |
files | src/http/ngx_http.c |
diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http.c Thu Mar 19 16:06:32 2009 +0000 +++ b/src/http/ngx_http.c Thu Mar 19 16:07:40 2009 +0000 @@ -1395,7 +1395,12 @@ name = addr[a].names.elts; for (s = 0; s < addr[a].names.nelts; s++) { - if (addr[a].core_srv_conf == name[s].core_srv_conf) { + if (addr[a].core_srv_conf == name[s].core_srv_conf +#if (NGX_PCRE) + && name[s].captures == 0 +#endif + ) + { continue; } @@ -1806,7 +1811,11 @@ && (addr[i].wc_head == NULL || addr[i].wc_head->hash.buckets == NULL) && (addr[i].wc_tail == NULL - || addr[i].wc_tail->hash.buckets == NULL)) + || addr[i].wc_tail->hash.buckets == NULL) +#if (NGX_PCRE) + && addr[i].nregex == 0 +#endif + ) { continue; }