mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-13 06:12:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

always run regex in server_name to get captures

Browse Source
This commit is contained in:
Igor Sysoev 2009-03-19 16:07:40 +00:00
parent e231e58367
commit 7b5edd8ffe
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/http/ngx_http.c
View File

@ -1395,7 +1395,12 @@ ngx_http_optimize_servers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf,
name = addr[a].names.elts; name = addr[a].names.elts;
for (s = 0; s < addr[a].names.nelts; s++) { 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; continue;
} }
@ -1806,7 +1811,11 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport,
&& (addr[i].wc_head == NULL && (addr[i].wc_head == NULL
|| addr[i].wc_head->hash.buckets == NULL) || addr[i].wc_head->hash.buckets == NULL)
&& (addr[i].wc_tail == 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; continue;
} }