From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 14 Dec 2010 10:41:22 +0000 (+0000)
Subject: merge r3825, r3826:
X-Git-Tag: release-0.8.54~1
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=1db960a374ec3e56e6b117c0e5e877fd75f53922;p=nginx.git

merge r3825, r3826:

*) test wildcard tail hash existance for IPv6 addresses,
   the same fix for IPv4 addresses has been made in r2581
*) always run regex in server_name to get captures for IPv6 addresses,
   the same fix for IPv4 addresses has been made in r2584
---

diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 4ecd50ce8..9e78ac441 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1870,8 +1870,12 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
         if (addr[i].hash.buckets == NULL
             && (addr[i].wc_head == NULL
                 || addr[i].wc_head->hash.buckets == NULL)
-            && (addr[i].wc_head == NULL
-                || addr[i].wc_head->hash.buckets == NULL))
+            && (addr[i].wc_tail == NULL
+                || addr[i].wc_tail->hash.buckets == NULL)
+#if (NGX_PCRE)
+            && addr[i].nregex == 0
+#endif
+            )
         {
             continue;
         }