nginx-0.3.18-RELEASE importrelease-0.3.18

    *) Feature: the "server_names" directive supports the ".domain.tld"
       names.

    *) Feature: the "server_names" directive uses the hash for the
       "*.domain.tld" names and more effective hash for usual names.

    *) Change: the "server_names_hash_max_size" and
       "server_names_hash_bucket_size" directives.

    *) Change: the "server_names_hash" and "server_names_hash_threshold"
       directives were canceled.

    *) Feature: the "valid_referers" directive uses the hash site names.

    *) Change: now the "valid_referers" directive checks the site names
       only without the URI part.

    *) Bugfix: some ".domain.tld" names incorrectly processed by the
       ngx_http_map_module.

    *) Bugfix: segmentation fault was occurred if configuration file did
       not exist; the bug had appeared in 0.3.12.

    *) Bugfix: on 64-bit platforms segmentation fault may occurred on
       start; the bug had appeared in 0.3.16.

1 files changed, 10 insertions, 4 deletions

diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index 9e6fd15e0..dce919f13 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -250,14 +250,20 @@ typedef struct {
 } ngx_http_connection_t;
 
 
+typedef struct {
+    ngx_hash_t                        hash;
+    ngx_hash_wildcard_t              *dns_wildcards;
+} ngx_http_virtual_names_t;
+
+
 typedef void (*ngx_http_cleanup_pt)(void *data);
 
 typedef struct ngx_http_cleanup_s  ngx_http_cleanup_t;
 
 struct ngx_http_cleanup_s {
-    ngx_http_cleanup_pt   handler;
-    void                 *data;
-    ngx_http_cleanup_t   *next;
+    ngx_http_cleanup_pt               handler;
+    void                             *data;
+    ngx_http_cleanup_t               *next;
 };
 
 
@@ -325,7 +331,7 @@ struct ngx_http_request_s {
     ngx_uint_t                        port;
     ngx_str_t                        *port_text;    /* ":80" */
     ngx_str_t                         server_name;
-    ngx_http_in_addr_t               *virtual_names;
+    ngx_http_virtual_names_t         *virtual_names;
 
     ngx_uint_t                        phase;
     ngx_int_t                         phase_handler;