aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/http/ngx_http.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index dd33169da..2e7018003 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1395,7 +1395,12 @@ ngx_http_optimize_servers(ngx_conf_t *cf, ngx_http_core_main_conf_t *cmcf,
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 @@ ngx_http_add_addrs(ngx_conf_t *cf, ngx_http_port_t *hport,
&& (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;
}