]> git.kaiwu.me - nginx.git/commitdiff
always run regex in server_name to get captures for IPv6 addresses,
authorIgor Sysoev <igor@sysoev.ru>
Sun, 12 Dec 2010 21:13:27 +0000 (21:13 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Sun, 12 Dec 2010 21:13:27 +0000 (21:13 +0000)
the same fix for IPv4 addresses has been made in r2584

src/http/ngx_http.c

index 9ca52b90285db8ce7422bd8beb5a664a74199b4e..5ca9fed3cb66f64ed288f4fb8df458b785db180f 100644 (file)
@@ -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;
         }