the "www.example.*" wildcard hash support
diff --git a/src/http/modules/ngx_http_map_module.c b/src/http/modules/ngx_http_map_module.c
index fb8e8ee..4a8acd0 100644
--- a/src/http/modules/ngx_http_map_module.c
+++ b/src/http/modules/ngx_http_map_module.c
@@ -26,8 +26,7 @@
typedef struct {
- ngx_hash_t hash;
- ngx_hash_wildcard_t *dns_wildcards;
+ ngx_hash_combined_t hash;
ngx_int_t index;
ngx_http_variable_value_t *default_value;
ngx_uint_t hostnames; /* unsigned hostnames:1 */
@@ -142,28 +141,13 @@
key = ngx_hash(key, name[i]);
}
- value = NULL;
-
- if (map->hash.buckets) {
- value = ngx_hash_find(&map->hash, key, name, len);
- }
+ value = ngx_hash_find_combined(&map->hash, key, name, len);
if (value) {
*v = *value;
} else {
- if (map->dns_wildcards && map->dns_wildcards->hash.buckets) {
- value = ngx_hash_find_wildcard(map->dns_wildcards, name, len);
- if (value) {
- *v = *value;
-
- } else {
- *v = *map->default_value;
- }
-
- } else {
- *v = *map->default_value;
- }
+ *v = *map->default_value;
}
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@@ -282,6 +266,9 @@
return rv;
}
+ map->default_value = ctx.default_value ? ctx.default_value:
+ &ngx_http_variable_null_value;
+
hash.key = ngx_hash_key_lc;
hash.max_size = mcf->hash_max_size;
hash.bucket_size = mcf->hash_bucket_size;
@@ -289,7 +276,7 @@
hash.pool = cf->pool;
if (ctx.keys.keys.nelts) {
- hash.hash = &map->hash;
+ hash.hash = &map->hash.hash;
hash.temp_pool = NULL;
if (ngx_hash_init(&hash, ctx.keys.keys.elts, ctx.keys.keys.nelts)
@@ -300,27 +287,44 @@
}
}
- map->default_value = ctx.default_value ? ctx.default_value:
- &ngx_http_variable_null_value;
+ if (ctx.keys.dns_wc_head.nelts) {
- if (ctx.keys.dns_wildcards.nelts) {
-
- ngx_qsort(ctx.keys.dns_wildcards.elts,
- (size_t) ctx.keys.dns_wildcards.nelts,
+ ngx_qsort(ctx.keys.dns_wc_head.elts,
+ (size_t) ctx.keys.dns_wc_head.nelts,
sizeof(ngx_hash_key_t), ngx_http_map_cmp_dns_wildcards);
hash.hash = NULL;
hash.temp_pool = pool;
- if (ngx_hash_wildcard_init(&hash, ctx.keys.dns_wildcards.elts,
- ctx.keys.dns_wildcards.nelts)
+ if (ngx_hash_wildcard_init(&hash, ctx.keys.dns_wc_head.elts,
+ ctx.keys.dns_wc_head.nelts)
!= NGX_OK)
{
ngx_destroy_pool(pool);
return NGX_CONF_ERROR;
}
- map->dns_wildcards = (ngx_hash_wildcard_t *) hash.hash;
+ map->hash.wc_head = (ngx_hash_wildcard_t *) hash.hash;
+ }
+
+ if (ctx.keys.dns_wc_tail.nelts) {
+
+ ngx_qsort(ctx.keys.dns_wc_tail.elts,
+ (size_t) ctx.keys.dns_wc_tail.nelts,
+ sizeof(ngx_hash_key_t), ngx_http_map_cmp_dns_wildcards);
+
+ hash.hash = NULL;
+ hash.temp_pool = pool;
+
+ if (ngx_hash_wildcard_init(&hash, ctx.keys.dns_wc_tail.elts,
+ ctx.keys.dns_wc_tail.nelts)
+ != NGX_OK)
+ {
+ ngx_destroy_pool(pool);
+ return NGX_CONF_ERROR;
+ }
+
+ map->hash.wc_tail = (ngx_hash_wildcard_t *) hash.hash;
}
ngx_destroy_pool(pool);
@@ -344,10 +348,9 @@
static char *
ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
{
- u_char ch;
ngx_int_t rc;
ngx_str_t *value, file;
- ngx_uint_t i, key, flags;
+ ngx_uint_t i, key;
ngx_http_map_conf_ctx_t *ctx;
ngx_http_variable_value_t *var, **vp;
@@ -439,50 +442,36 @@
found:
- ch = value[0].data[0];
+ if (ngx_strcmp(value[0].data, "default") == 0) {
- if ((ch != '*' && ch != '.') || ctx->hostnames == 0) {
-
- if (ngx_strcmp(value[0].data, "default") == 0) {
-
- if (ctx->default_value) {
- ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "duplicate default map parameter");
- return NGX_CONF_ERROR;
- }
-
- ctx->default_value = var;
-
- return NGX_CONF_OK;
- }
-
- if (value[0].len && ch == '!') {
- value[0].len--;
- value[0].data++;
- }
-
- flags = 0;
-
- } else {
-
- if ((ch == '*' && (value[0].len < 3 || value[0].data[1] != '.'))
- || (ch == '.' && value[0].len < 2))
- {
+ if (ctx->default_value) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "invalid DNS wildcard \"%V\"", &value[0]);
-
+ "duplicate default map parameter");
return NGX_CONF_ERROR;
}
- flags = NGX_HASH_WILDCARD_KEY;
+ ctx->default_value = var;
+
+ return NGX_CONF_OK;
}
- rc = ngx_hash_add_key(&ctx->keys, &value[0], var, flags);
+ if (value[0].len && value[0].data[0] == '!') {
+ value[0].len--;
+ value[0].data++;
+ }
+
+ rc = ngx_hash_add_key(&ctx->keys, &value[0], var,
+ (ctx->hostnames) ? NGX_HASH_WILDCARD_KEY : 0);
if (rc == NGX_OK) {
return NGX_CONF_OK;
}
+ if (rc == NGX_DECLINED) {
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+ "invalid hostname or wildcard \"%V\"", &value[0]);
+ }
+
if (rc == NGX_BUSY) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"conflicting parameter \"%V\"", &value[0]);
diff --git a/src/http/modules/ngx_http_referer_module.c b/src/http/modules/ngx_http_referer_module.c
index 2d16bd5..8559521 100644
--- a/src/http/modules/ngx_http_referer_module.c
+++ b/src/http/modules/ngx_http_referer_module.c
@@ -12,8 +12,7 @@
#define NGX_HTTP_REFERER_NO_URI_PART ((void *) 4)
typedef struct {
- ngx_hash_t hash;
- ngx_hash_wildcard_t *dns_wildcards;
+ ngx_hash_combined_t hash;
ngx_flag_t no_referer;
ngx_flag_t blocked_referer;
@@ -90,7 +89,10 @@
rlcf = ngx_http_get_module_loc_conf(r, ngx_http_referer_module);
- if (rlcf->hash.buckets == NULL && rlcf->dns_wildcards == NULL) {
+ if (rlcf->hash.hash.buckets == NULL
+ && rlcf->hash.wc_head == NULL
+ && rlcf->hash.wc_tail == NULL)
+ {
goto valid;
}
@@ -135,18 +137,10 @@
len = p - ref;
- if (rlcf->hash.buckets) {
- uri = ngx_hash_find(&rlcf->hash, key, buf, len);
- if (uri) {
- goto uri;
- }
- }
+ uri = ngx_hash_find_combined(&rlcf->hash, key, buf, len);
- if (rlcf->dns_wildcards) {
- uri = ngx_hash_find_wildcard(rlcf->dns_wildcards, buf, len);
- if (uri) {
- goto uri;
- }
+ if (uri) {
+ goto uri;
}
invalid:
@@ -208,7 +202,6 @@
if (conf->keys == NULL) {
conf->hash = prev->hash;
- conf->dns_wildcards = prev->dns_wildcards;
ngx_conf_merge_value(conf->no_referer, prev->no_referer, 0);
ngx_conf_merge_value(conf->blocked_referer, prev->blocked_referer, 0);
@@ -217,7 +210,9 @@
}
if ((conf->no_referer == 1 || conf->blocked_referer == 1)
- && conf->keys->keys.nelts == 0 && conf->keys->dns_wildcards.nelts == 0)
+ && conf->keys->keys.nelts == 0
+ && conf->keys->dns_wc_head.nelts == 0
+ && conf->keys->dns_wc_tail.nelts == 0)
{
ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"the \"none\" or \"blocked\" referers are specified "
@@ -233,7 +228,7 @@
hash.pool = cf->pool;
if (conf->keys->keys.nelts) {
- hash.hash = &conf->hash;
+ hash.hash = &conf->hash.hash;
hash.temp_pool = NULL;
if (ngx_hash_init(&hash, conf->keys->keys.elts, conf->keys->keys.nelts)
@@ -243,24 +238,44 @@
}
}
- if (conf->keys->dns_wildcards.nelts) {
+ if (conf->keys->dns_wc_head.nelts) {
- ngx_qsort(conf->keys->dns_wildcards.elts,
- (size_t) conf->keys->dns_wildcards.nelts,
+ ngx_qsort(conf->keys->dns_wc_head.elts,
+ (size_t) conf->keys->dns_wc_head.nelts,
sizeof(ngx_hash_key_t),
ngx_http_cmp_referer_wildcards);
hash.hash = NULL;
hash.temp_pool = cf->temp_pool;
- if (ngx_hash_wildcard_init(&hash, conf->keys->dns_wildcards.elts,
- conf->keys->dns_wildcards.nelts)
+ if (ngx_hash_wildcard_init(&hash, conf->keys->dns_wc_head.elts,
+ conf->keys->dns_wc_head.nelts)
!= NGX_OK)
{
return NGX_CONF_ERROR;
}
- conf->dns_wildcards = (ngx_hash_wildcard_t *) hash.hash;
+ conf->hash.wc_head = (ngx_hash_wildcard_t *) hash.hash;
+ }
+
+ if (conf->keys->dns_wc_tail.nelts) {
+
+ ngx_qsort(conf->keys->dns_wc_tail.elts,
+ (size_t) conf->keys->dns_wc_tail.nelts,
+ sizeof(ngx_hash_key_t),
+ ngx_http_cmp_referer_wildcards);
+
+ hash.hash = NULL;
+ hash.temp_pool = cf->temp_pool;
+
+ if (ngx_hash_wildcard_init(&hash, conf->keys->dns_wc_tail.elts,
+ conf->keys->dns_wc_tail.nelts)
+ != NGX_OK)
+ {
+ return NGX_CONF_ERROR;
+ }
+
+ conf->hash.wc_tail = (ngx_hash_wildcard_t *) hash.hash;
}
if (conf->no_referer == NGX_CONF_UNSET) {
@@ -373,23 +388,8 @@
ngx_http_add_referer(ngx_conf_t *cf, ngx_hash_keys_arrays_t *keys,
ngx_str_t *value, ngx_str_t *uri)
{
- u_char ch;
- ngx_int_t rc;
- ngx_str_t *u;
- ngx_uint_t flags;
-
- ch = value->data[0];
-
- if ((ch == '*' && (value->len < 3 || value->data[1] != '.'))
- || (ch == '.' && value->len < 2))
- {
- ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "invalid DNS wildcard \"%V\"", value);
-
- return NGX_CONF_ERROR;
- }
-
- flags = (ch == '*' || ch == '.') ? NGX_HASH_WILDCARD_KEY : 0;
+ ngx_int_t rc;
+ ngx_str_t *u;
if (uri->len == 0) {
u = NGX_HTTP_REFERER_NO_URI_PART;
@@ -403,12 +403,17 @@
*u = *uri;
}
- rc = ngx_hash_add_key(keys, value, u, flags);
+ rc = ngx_hash_add_key(keys, value, u, NGX_HASH_WILDCARD_KEY);
if (rc == NGX_OK) {
return NGX_CONF_OK;
}
+ if (rc == NGX_DECLINED) {
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+ "invalid hostname or wildcard \"%V\"", value);
+ }
+
if (rc == NGX_BUSY) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"conflicting parameter \"%V\"", value);
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index c6bc6c5..5823a2b 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -73,7 +73,6 @@
ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
char *rv;
- u_char ch;
ngx_int_t rc, j;
ngx_uint_t mi, m, s, l, p, a, i, n;
ngx_uint_t find_config_index, use_rewrite, use_access;
@@ -648,36 +647,9 @@
}
name = in_addr[a].names.elts;
- for (s = 0; s < in_addr[a].names.nelts; s++) {
-
- ch = name[s].name.data[0];
-
- if (ch == '*' || ch == '.') {
- continue;
- }
-
- rc = ngx_hash_add_key(&ha, &name[s].name, name[s].core_srv_conf,
- 0);
-
- if (rc == NGX_ERROR) {
- return NGX_CONF_ERROR;
- }
-
- if (rc == NGX_BUSY) {
- ngx_log_error(NGX_LOG_WARN, cf->log, 0,
- "conflicting server name \"%V\" on %s, ignored",
- &name[s].name, in_addr[a].listen_conf->addr);
- }
- }
for (s = 0; s < in_addr[a].names.nelts; s++) {
- ch = name[s].name.data[0];
-
- if (ch != '*' && ch != '.') {
- continue;
- }
-
rc = ngx_hash_add_key(&ha, &name[s].name, name[s].core_srv_conf,
NGX_HASH_WILDCARD_KEY);
@@ -685,6 +657,13 @@
return NGX_CONF_ERROR;
}
+ if (rc == NGX_DECLINED) {
+ ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
+ "invalid server name or wildcard \"%V\" on %s",
+ &name[s].name, in_addr[a].listen_conf->addr);
+ return NGX_CONF_ERROR;
+ }
+
if (rc == NGX_BUSY) {
ngx_log_error(NGX_LOG_WARN, cf->log, 0,
"conflicting server name \"%V\" on %s, ignored",
@@ -709,25 +688,46 @@
}
}
- if (ha.dns_wildcards.nelts) {
+ if (ha.dns_wc_head.nelts) {
- ngx_qsort(ha.dns_wildcards.elts,
- (size_t) ha.dns_wildcards.nelts,
+ ngx_qsort(ha.dns_wc_head.elts,
+ (size_t) ha.dns_wc_head.nelts,
sizeof(ngx_hash_key_t),
ngx_http_cmp_dns_wildcards);
hash.hash = NULL;
hash.temp_pool = ha.temp_pool;
- if (ngx_hash_wildcard_init(&hash, ha.dns_wildcards.elts,
- ha.dns_wildcards.nelts)
+ if (ngx_hash_wildcard_init(&hash, ha.dns_wc_head.elts,
+ ha.dns_wc_head.nelts)
!= NGX_OK)
{
ngx_destroy_pool(ha.temp_pool);
return NGX_CONF_ERROR;
}
- in_addr[a].dns_wildcards = (ngx_hash_wildcard_t *) hash.hash;
+ in_addr[a].wc_head = (ngx_hash_wildcard_t *) hash.hash;
+ }
+
+ if (ha.dns_wc_tail.nelts) {
+
+ ngx_qsort(ha.dns_wc_tail.elts,
+ (size_t) ha.dns_wc_tail.nelts,
+ sizeof(ngx_hash_key_t),
+ ngx_http_cmp_dns_wildcards);
+
+ hash.hash = NULL;
+ hash.temp_pool = ha.temp_pool;
+
+ if (ngx_hash_wildcard_init(&hash, ha.dns_wc_tail.elts,
+ ha.dns_wc_tail.nelts)
+ != NGX_OK)
+ {
+ ngx_destroy_pool(ha.temp_pool);
+ return NGX_CONF_ERROR;
+ }
+
+ in_addr[a].wc_tail = (ngx_hash_wildcard_t *) hash.hash;
}
ngx_destroy_pool(ha.temp_pool);
@@ -848,8 +848,10 @@
hip->addrs[i].core_srv_conf = in_addr[i].core_srv_conf;
if (in_addr[i].hash.buckets == NULL
- && (in_addr[i].dns_wildcards == NULL
- || in_addr[i].dns_wildcards->hash.buckets == NULL))
+ && (in_addr[i].wc_head == NULL
+ || in_addr[i].wc_head->hash.buckets == NULL)
+ && (in_addr[i].wc_head == NULL
+ || in_addr[i].wc_head->hash.buckets == NULL))
{
continue;
}
@@ -861,7 +863,8 @@
hip->addrs[i].virtual_names = vn;
vn->hash = in_addr[i].hash;
- vn->dns_wildcards = in_addr[i].dns_wildcards;
+ vn->wc_head = in_addr[i].wc_head;
+ vn->wc_tail = in_addr[i].wc_tail;
}
if (done) {
@@ -934,7 +937,8 @@
in_addr->addr = lscf->addr;
in_addr->hash.buckets = NULL;
in_addr->hash.size = 0;
- in_addr->dns_wildcards = NULL;
+ in_addr->wc_head = NULL;
+ in_addr->wc_tail = NULL;
in_addr->names.elts = NULL;
in_addr->core_srv_conf = cscf;
in_addr->default_server = lscf->conf.default_server;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index c8b6994..a903c9a 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2618,7 +2618,7 @@
ch = value[1].data[0];
if (cscf->server_name.data == NULL && value[1].len) {
- if (ch == '*') {
+ if (ngx_strchr(value[1].data, '*')) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"first server name \"%V\" must not be wildcard",
&value[1]);
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index db1e043..59e4624 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -173,7 +173,8 @@
in_addr_t addr;
ngx_hash_t hash;
- ngx_hash_wildcard_t *dns_wildcards;
+ ngx_hash_wildcard_t *wc_head;
+ ngx_hash_wildcard_t *wc_tail;
ngx_array_t names; /* array of ngx_http_server_name_t */
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 0306bf6..66381e0 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1459,19 +1459,10 @@
vn = r->virtual_names;
- if (vn->hash.buckets) {
- cscf = ngx_hash_find(&vn->hash, hash, host, len);
- if (cscf) {
- goto found;
- }
- }
+ cscf = ngx_hash_find_combined(vn, hash, host, len);
- if (vn->dns_wildcards && vn->dns_wildcards->hash.buckets) {
- cscf = ngx_hash_find_wildcard(vn->dns_wildcards, host, len);
-
- if (cscf) {
- goto found;
- }
+ if (cscf) {
+ goto found;
}
cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h
index a380ac0..b440f14 100644
--- a/src/http/ngx_http_request.h
+++ b/src/http/ngx_http_request.h
@@ -275,10 +275,7 @@
} 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);
