r1254, r1416, r1493 merge:

the "www.example.*" wildcard hash support

1 files changed, 1 insertions, 4 deletions

diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index a380ac0f0..b440f14fd 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -275,10 +275,7 @@ typedef struct {
 } ngx_http_connection_t;
 
 
-typedef struct {
-    ngx_hash_t                        hash;
-    ngx_hash_wildcard_t              *dns_wildcards;
-} ngx_http_virtual_names_t;
+typedef ngx_hash_combined_t  ngx_http_virtual_names_t;
 
 
 typedef void (*ngx_http_cleanup_pt)(void *data);