Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2010-12-13 00:13:27 +0300
committerIgor Sysoev <igor@sysoev.ru>2010-12-13 00:13:27 +0300
commit5644c43caf8130d511758b8f9727c4fd4e0388d4 (patch)
tree60da79c16e790ed55578181ce0913293e31deacd /src
parent1fdb004f523a2581f1ddcbf4fbca2db125ee9687 (diff)
always run regex in server_name to get captures for IPv6 addresses,
the same fix for IPv4 addresses has been made in r2584
Diffstat (limited to 'src')
-rw-r--r--src/http/ngx_http.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 9ca52b902..5ca9fed3c 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1871,7 +1871,11 @@ ngx_http_add_addrs6(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;
}