Mercurial > hg > nginx

changeset 3825:3770119af0b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
always run regex in server_name to get captures for IPv6 addresses, the same fix for IPv4 addresses has been made in r2584
author Igor Sysoev <igor@sysoev.ru>
date Sun, 12 Dec 2010 21:13:27 +0000
parents 4ee02b872591
children 6843e7c492b7
files src/http/ngx_http.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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_
             && (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;
         }