Mercurial > hg > nginx
annotate src/http/modules/ngx_http_map_module.c @ 4377:726a1ca9b52b
Proxy: made proxy_pass with variables more consistent.
If proxy_pass was used with variables and there was no URI component,
nginx always used unparsed URI. This isn't consistent with "no variables"
case, where e.g. rewrites are applied even if there is no URI component.
Fix is to use the same logic in both cases, i.e. only use unparsed URI if
it's valid and request is the main one.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Fri, 23 Dec 2011 16:04:09 +0000 |
| parents | ace14fd91086 |
| children | d620f497c50f |
| rev | line source |
|---|---|
| 589 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4 */ | |
| 5 | |
| 6 | |
| 7 #include <ngx_config.h> | |
| 8 #include <ngx_core.h> | |
| 9 #include <ngx_http.h> | |
| 10 | |
| 11 | |
| 12 typedef struct { | |
| 13 ngx_uint_t hash_max_size; | |
| 14 ngx_uint_t hash_bucket_size; | |
| 15 } ngx_http_map_conf_t; | |
| 16 | |
| 17 | |
| 18 typedef struct { | |
| 593 | 19 ngx_hash_keys_arrays_t keys; |
| 589 | 20 |
| 21 ngx_array_t *values_hash; | |
|
3792
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
22 ngx_array_t var_values; |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
23 #if (NGX_PCRE) |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
24 ngx_array_t regexes; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
25 #endif |
| 589 | 26 |
| 27 ngx_http_variable_value_t *default_value; | |
|
3792
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
28 ngx_conf_t *cf; |
| 589 | 29 ngx_uint_t hostnames; /* unsigned hostnames:1 */ |
| 30 } ngx_http_map_conf_ctx_t; | |
| 31 | |
| 32 | |
| 33 typedef struct { | |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
34 ngx_http_map_t map; |
|
3789
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
35 ngx_http_complex_value_t value; |
| 589 | 36 ngx_http_variable_value_t *default_value; |
| 37 ngx_uint_t hostnames; /* unsigned hostnames:1 */ | |
| 38 } ngx_http_map_ctx_t; | |
| 39 | |
| 40 | |
| 41 static int ngx_libc_cdecl ngx_http_map_cmp_dns_wildcards(const void *one, | |
| 42 const void *two); | |
| 43 static void *ngx_http_map_create_conf(ngx_conf_t *cf); | |
| 44 static char *ngx_http_map_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); | |
| 45 static char *ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf); | |
| 46 | |
| 47 | |
| 48 static ngx_command_t ngx_http_map_commands[] = { | |
| 49 | |
| 50 { ngx_string("map"), | |
| 51 NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_TAKE2, | |
| 52 ngx_http_map_block, | |
| 53 NGX_HTTP_MAIN_CONF_OFFSET, | |
| 54 0, | |
| 55 NULL }, | |
| 56 | |
| 57 { ngx_string("map_hash_max_size"), | |
| 58 NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1, | |
| 59 ngx_conf_set_num_slot, | |
| 60 NGX_HTTP_MAIN_CONF_OFFSET, | |
| 61 offsetof(ngx_http_map_conf_t, hash_max_size), | |
| 62 NULL }, | |
| 63 | |
| 64 { ngx_string("map_hash_bucket_size"), | |
| 65 NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1, | |
| 66 ngx_conf_set_num_slot, | |
| 67 NGX_HTTP_MAIN_CONF_OFFSET, | |
| 68 offsetof(ngx_http_map_conf_t, hash_bucket_size), | |
| 69 NULL }, | |
| 70 | |
| 71 ngx_null_command | |
| 72 }; | |
| 73 | |
| 74 | |
| 75 static ngx_http_module_t ngx_http_map_module_ctx = { | |
| 76 NULL, /* preconfiguration */ | |
| 77 NULL, /* postconfiguration */ | |
| 78 | |
| 79 ngx_http_map_create_conf, /* create main configuration */ | |
| 80 NULL, /* init main configuration */ | |
| 81 | |
| 82 NULL, /* create server configuration */ | |
| 83 NULL, /* merge server configuration */ | |
| 84 | |
| 85 NULL, /* create location configuration */ | |
| 86 NULL /* merge location configuration */ | |
| 87 }; | |
| 88 | |
| 89 | |
| 90 ngx_module_t ngx_http_map_module = { | |
| 91 NGX_MODULE_V1, | |
| 92 &ngx_http_map_module_ctx, /* module context */ | |
| 93 ngx_http_map_commands, /* module directives */ | |
| 94 NGX_HTTP_MODULE, /* module type */ | |
| 95 NULL, /* init master */ | |
| 96 NULL, /* init module */ | |
| 97 NULL, /* init process */ | |
| 98 NULL, /* init thread */ | |
| 99 NULL, /* exit thread */ | |
| 100 NULL, /* exit process */ | |
| 101 NULL, /* exit master */ | |
| 102 NGX_MODULE_V1_PADDING | |
| 103 }; | |
| 104 | |
| 105 | |
| 106 static ngx_int_t | |
| 107 ngx_http_map_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v, | |
| 108 uintptr_t data) | |
| 109 { | |
| 110 ngx_http_map_ctx_t *map = (ngx_http_map_ctx_t *) data; | |
| 111 | |
| 112 size_t len; | |
|
3789
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
113 ngx_str_t val; |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
114 ngx_http_variable_value_t *value; |
| 589 | 115 |
| 116 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 117 "http map started"); | |
| 118 | |
|
3789
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
119 if (ngx_http_complex_value(r, &map->value, &val) != NGX_OK) { |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
120 return NGX_ERROR; |
|
797
36f7b549f481
fix segfault if $server_addr failed
Igor Sysoev <igor@sysoev.ru>
parents:
637
diff
changeset
|
121 } |
|
36f7b549f481
fix segfault if $server_addr failed
Igor Sysoev <igor@sysoev.ru>
parents:
637
diff
changeset
|
122 |
|
3789
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
123 len = val.len; |
| 589 | 124 |
|
3789
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
125 if (len && map->hostnames && val.data[len - 1] == '.') { |
| 589 | 126 len--; |
| 127 } | |
| 128 | |
|
3929
fa4612bfb9fa
change ngx_http_map_find(): use case sensitive regexes
Igor Sysoev <igor@sysoev.ru>
parents:
3874
diff
changeset
|
129 value = ngx_http_map_find(r, &map->map, &val); |
| 589 | 130 |
|
3792
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
131 if (value == NULL) { |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
132 value = map->default_value; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
133 } |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
134 |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
135 if (!value->valid) { |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
136 value = ngx_http_get_flushed_variable(r, (ngx_uint_t) value->data); |
| 589 | 137 |
|
3792
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
138 if (value == NULL || value->not_found) { |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
139 value = &ngx_http_variable_null_value; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
140 } |
| 589 | 141 } |
| 142 | |
|
3792
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
143 *v = *value; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
144 |
| 589 | 145 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
3789
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
146 "http map: \"%v\" \"%v\"", &val, v); |
| 589 | 147 |
| 148 return NGX_OK; | |
| 149 } | |
| 150 | |
| 151 | |
| 152 static void * | |
| 153 ngx_http_map_create_conf(ngx_conf_t *cf) | |
| 154 { | |
| 155 ngx_http_map_conf_t *mcf; | |
| 156 | |
| 157 mcf = ngx_palloc(cf->pool, sizeof(ngx_http_map_conf_t)); | |
| 158 if (mcf == NULL) { | |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2536
diff
changeset
|
159 return NULL; |
| 589 | 160 } |
| 161 | |
| 162 mcf->hash_max_size = NGX_CONF_UNSET_UINT; | |
| 163 mcf->hash_bucket_size = NGX_CONF_UNSET_UINT; | |
| 164 | |
| 165 return mcf; | |
| 166 } | |
| 167 | |
| 168 | |
| 169 static char * | |
| 170 ngx_http_map_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 171 { | |
| 172 ngx_http_map_conf_t *mcf = conf; | |
| 173 | |
|
3789
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
174 char *rv; |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
175 ngx_str_t *value, name; |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
176 ngx_conf_t save; |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
177 ngx_pool_t *pool; |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
178 ngx_hash_init_t hash; |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
179 ngx_http_map_ctx_t *map; |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
180 ngx_http_variable_t *var; |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
181 ngx_http_map_conf_ctx_t ctx; |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
182 ngx_http_compile_complex_value_t ccv; |
| 589 | 183 |
| 184 if (mcf->hash_max_size == NGX_CONF_UNSET_UINT) { | |
| 185 mcf->hash_max_size = 2048; | |
| 186 } | |
| 187 | |
| 188 if (mcf->hash_bucket_size == NGX_CONF_UNSET_UINT) { | |
| 189 mcf->hash_bucket_size = ngx_cacheline_size; | |
| 190 | |
| 191 } else { | |
| 192 mcf->hash_bucket_size = ngx_align(mcf->hash_bucket_size, | |
| 193 ngx_cacheline_size); | |
| 194 } | |
| 195 | |
| 196 map = ngx_pcalloc(cf->pool, sizeof(ngx_http_map_ctx_t)); | |
| 197 if (map == NULL) { | |
| 198 return NGX_CONF_ERROR; | |
| 199 } | |
| 200 | |
| 201 value = cf->args->elts; | |
| 202 | |
|
3789
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
203 ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t)); |
| 589 | 204 |
|
3789
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
205 ccv.cf = cf; |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
206 ccv.value = &value[1]; |
|
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
207 ccv.complex_value = &map->value; |
| 589 | 208 |
|
3789
19c931be8b98
allow expressions in the first "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3642
diff
changeset
|
209 if (ngx_http_compile_complex_value(&ccv) != NGX_OK) { |
| 589 | 210 return NGX_CONF_ERROR; |
| 211 } | |
| 212 | |
| 213 name = value[2]; | |
| 214 name.len--; | |
| 215 name.data++; | |
| 216 | |
| 1565 | 217 var = ngx_http_add_variable(cf, &name, NGX_HTTP_VAR_CHANGEABLE); |
| 589 | 218 if (var == NULL) { |
| 219 return NGX_CONF_ERROR; | |
| 220 } | |
| 221 | |
| 637 | 222 var->get_handler = ngx_http_map_variable; |
| 589 | 223 var->data = (uintptr_t) map; |
| 224 | |
| 225 pool = ngx_create_pool(16384, cf->log); | |
| 226 if (pool == NULL) { | |
| 227 return NGX_CONF_ERROR; | |
| 228 } | |
| 229 | |
| 593 | 230 ctx.keys.pool = cf->pool; |
| 231 ctx.keys.temp_pool = pool; | |
| 589 | 232 |
| 593 | 233 if (ngx_hash_keys_array_init(&ctx.keys, NGX_HASH_LARGE) != NGX_OK) { |
| 589 | 234 ngx_destroy_pool(pool); |
| 235 return NGX_CONF_ERROR; | |
| 236 } | |
| 237 | |
| 593 | 238 ctx.values_hash = ngx_pcalloc(pool, sizeof(ngx_array_t) * ctx.keys.hsize); |
| 589 | 239 if (ctx.values_hash == NULL) { |
| 240 ngx_destroy_pool(pool); | |
| 241 return NGX_CONF_ERROR; | |
| 242 } | |
| 243 | |
|
3792
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
244 if (ngx_array_init(&ctx.var_values, cf->pool, 2, |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
245 sizeof(ngx_http_variable_value_t)) |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
246 != NGX_OK) |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
247 { |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
248 ngx_destroy_pool(pool); |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
249 return NGX_CONF_ERROR; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
250 } |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
251 |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
252 #if (NGX_PCRE) |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
253 if (ngx_array_init(&ctx.regexes, cf->pool, 2, sizeof(ngx_http_map_regex_t)) |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
254 != NGX_OK) |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
255 { |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
256 ngx_destroy_pool(pool); |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
257 return NGX_CONF_ERROR; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
258 } |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
259 #endif |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
260 |
| 589 | 261 ctx.default_value = NULL; |
|
3792
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
262 ctx.cf = &save; |
| 589 | 263 ctx.hostnames = 0; |
| 264 | |
| 265 save = *cf; | |
| 266 cf->pool = pool; | |
| 267 cf->ctx = &ctx; | |
| 268 cf->handler = ngx_http_map; | |
| 269 cf->handler_conf = conf; | |
| 270 | |
| 271 rv = ngx_conf_parse(cf, NULL); | |
| 272 | |
| 273 *cf = save; | |
| 274 | |
| 275 if (rv != NGX_CONF_OK) { | |
| 276 ngx_destroy_pool(pool); | |
| 277 return rv; | |
| 278 } | |
| 279 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
280 map->default_value = ctx.default_value ? ctx.default_value: |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
281 &ngx_http_variable_null_value; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
282 |
| 589 | 283 hash.key = ngx_hash_key_lc; |
| 284 hash.max_size = mcf->hash_max_size; | |
| 285 hash.bucket_size = mcf->hash_bucket_size; | |
| 286 hash.name = "map_hash"; | |
| 287 hash.pool = cf->pool; | |
| 288 | |
| 593 | 289 if (ctx.keys.keys.nelts) { |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
290 hash.hash = &map->map.hash.hash; |
| 589 | 291 hash.temp_pool = NULL; |
| 292 | |
| 593 | 293 if (ngx_hash_init(&hash, ctx.keys.keys.elts, ctx.keys.keys.nelts) |
| 591 | 294 != NGX_OK) |
| 295 { | |
| 593 | 296 ngx_destroy_pool(pool); |
| 589 | 297 return NGX_CONF_ERROR; |
| 298 } | |
| 299 } | |
| 300 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
301 if (ctx.keys.dns_wc_head.nelts) { |
| 589 | 302 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
303 ngx_qsort(ctx.keys.dns_wc_head.elts, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
304 (size_t) ctx.keys.dns_wc_head.nelts, |
| 589 | 305 sizeof(ngx_hash_key_t), ngx_http_map_cmp_dns_wildcards); |
| 306 | |
| 307 hash.hash = NULL; | |
| 308 hash.temp_pool = pool; | |
| 309 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
310 if (ngx_hash_wildcard_init(&hash, ctx.keys.dns_wc_head.elts, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
311 ctx.keys.dns_wc_head.nelts) |
| 589 | 312 != NGX_OK) |
| 313 { | |
| 593 | 314 ngx_destroy_pool(pool); |
| 589 | 315 return NGX_CONF_ERROR; |
| 316 } | |
| 317 | |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
318 map->map.hash.wc_head = (ngx_hash_wildcard_t *) hash.hash; |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
319 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
320 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
321 if (ctx.keys.dns_wc_tail.nelts) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
322 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
323 ngx_qsort(ctx.keys.dns_wc_tail.elts, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
324 (size_t) ctx.keys.dns_wc_tail.nelts, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
325 sizeof(ngx_hash_key_t), ngx_http_map_cmp_dns_wildcards); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
326 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
327 hash.hash = NULL; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
328 hash.temp_pool = pool; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
329 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
330 if (ngx_hash_wildcard_init(&hash, ctx.keys.dns_wc_tail.elts, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
331 ctx.keys.dns_wc_tail.nelts) |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
332 != NGX_OK) |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
333 { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
334 ngx_destroy_pool(pool); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
335 return NGX_CONF_ERROR; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
336 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
337 |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
338 map->map.hash.wc_tail = (ngx_hash_wildcard_t *) hash.hash; |
| 589 | 339 } |
| 340 | |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
341 #if (NGX_PCRE) |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
342 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
343 if (ctx.regexes.nelts) { |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
344 map->map.regex = ctx.regexes.elts; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
345 map->map.nregex = ctx.regexes.nelts; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
346 } |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
347 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
348 #endif |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
349 |
| 589 | 350 ngx_destroy_pool(pool); |
| 351 | |
| 352 return rv; | |
| 353 } | |
| 354 | |
| 355 | |
| 356 static int ngx_libc_cdecl | |
| 357 ngx_http_map_cmp_dns_wildcards(const void *one, const void *two) | |
| 358 { | |
| 359 ngx_hash_key_t *first, *second; | |
| 360 | |
| 361 first = (ngx_hash_key_t *) one; | |
| 362 second = (ngx_hash_key_t *) two; | |
| 363 | |
|
3116
98e288c6dac3
If .domain.com, .sub.domain.com, and .domain-some.com were defined,
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
364 return ngx_dns_strcmp(first->key.data, second->key.data); |
| 589 | 365 } |
| 366 | |
| 367 | |
| 368 static char * | |
| 369 ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf) | |
| 370 { | |
|
3792
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
371 ngx_int_t rc, index; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
372 ngx_str_t *value, file, name; |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
373 ngx_uint_t i, key; |
| 589 | 374 ngx_http_map_conf_ctx_t *ctx; |
| 591 | 375 ngx_http_variable_value_t *var, **vp; |
| 589 | 376 |
| 377 ctx = cf->ctx; | |
| 378 | |
| 379 value = cf->args->elts; | |
| 380 | |
| 381 if (cf->args->nelts == 1 | |
| 382 && ngx_strcmp(value[0].data, "hostnames") == 0) | |
| 383 { | |
| 384 ctx->hostnames = 1; | |
| 385 return NGX_CONF_OK; | |
| 386 | |
| 387 } else if (cf->args->nelts != 2) { | |
| 388 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 389 "invalid number of the map parameters"); | |
| 390 return NGX_CONF_ERROR; | |
| 391 } | |
| 392 | |
| 393 if (ngx_strcmp(value[0].data, "include") == 0) { | |
| 394 file = value[1]; | |
| 395 | |
| 3642 | 396 if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) { |
| 589 | 397 return NGX_CONF_ERROR; |
| 398 } | |
| 399 | |
| 400 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cf->log, 0, "include %s", file.data); | |
| 401 | |
| 402 return ngx_conf_parse(cf, &file); | |
| 403 } | |
| 404 | |
|
3792
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
405 if (value[1].data[0] == '$') { |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
406 name = value[1]; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
407 name.len--; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
408 name.data++; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
409 |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
410 index = ngx_http_get_variable_index(ctx->cf, &name); |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
411 if (index == NGX_ERROR) { |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
412 return NGX_CONF_ERROR; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
413 } |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
414 |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
415 var = ctx->var_values.elts; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
416 |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
417 for (i = 0; i < ctx->var_values.nelts; i++) { |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
418 if (index == (ngx_int_t) var[i].data) { |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
419 goto found; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
420 } |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
421 } |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
422 |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
423 var = ngx_palloc(ctx->keys.pool, sizeof(ngx_http_variable_value_t)); |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
424 if (var == NULL) { |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
425 return NGX_CONF_ERROR; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
426 } |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
427 |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
428 var->valid = 0; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
429 var->no_cacheable = 0; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
430 var->not_found = 0; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
431 var->len = 0; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
432 var->data = (u_char *) index; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
433 |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
434 vp = ngx_array_push(&ctx->var_values); |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
435 if (vp == NULL) { |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
436 return NGX_CONF_ERROR; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
437 } |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
438 |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
439 *vp = var; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
440 |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
441 goto found; |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
442 } |
|
164a7f8df979
allow variable as "map" value
Igor Sysoev <igor@sysoev.ru>
parents:
3791
diff
changeset
|
443 |
| 589 | 444 key = 0; |
| 445 | |
| 446 for (i = 0; i < value[1].len; i++) { | |
| 447 key = ngx_hash(key, value[1].data[i]); | |
| 448 } | |
| 449 | |
| 593 | 450 key %= ctx->keys.hsize; |
| 589 | 451 |
| 452 vp = ctx->values_hash[key].elts; | |
| 453 | |
| 454 if (vp) { | |
| 455 for (i = 0; i < ctx->values_hash[key].nelts; i++) { | |
| 456 if (value[1].len != (size_t) vp[i]->len) { | |
| 457 continue; | |
| 458 } | |
| 459 | |
| 460 if (ngx_strncmp(value[1].data, vp[i]->data, value[1].len) == 0) { | |
| 461 var = vp[i]; | |
| 462 goto found; | |
| 463 } | |
| 464 } | |
| 465 | |
| 466 } else { | |
| 467 if (ngx_array_init(&ctx->values_hash[key], cf->pool, 4, | |
| 468 sizeof(ngx_http_variable_value_t *)) | |
| 469 != NGX_OK) | |
| 470 { | |
| 471 return NGX_CONF_ERROR; | |
| 472 } | |
| 473 } | |
| 474 | |
| 593 | 475 var = ngx_palloc(ctx->keys.pool, sizeof(ngx_http_variable_value_t)); |
| 589 | 476 if (var == NULL) { |
| 477 return NGX_CONF_ERROR; | |
| 478 } | |
| 479 | |
| 480 var->len = value[1].len; | |
| 593 | 481 var->data = ngx_pstrdup(ctx->keys.pool, &value[1]); |
| 589 | 482 if (var->data == NULL) { |
| 483 return NGX_CONF_ERROR; | |
| 484 } | |
| 485 | |
| 486 var->valid = 1; | |
| 1565 | 487 var->no_cacheable = 0; |
| 589 | 488 var->not_found = 0; |
| 489 | |
| 490 vp = ngx_array_push(&ctx->values_hash[key]); | |
| 491 if (vp == NULL) { | |
| 492 return NGX_CONF_ERROR; | |
| 493 } | |
| 494 | |
| 495 *vp = var; | |
| 496 | |
| 497 found: | |
| 498 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
499 if (ngx_strcmp(value[0].data, "default") == 0) { |
| 589 | 500 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
501 if (ctx->default_value) { |
| 589 | 502 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
503 "duplicate default map parameter"); |
| 589 | 504 return NGX_CONF_ERROR; |
| 505 } | |
| 506 | |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
507 ctx->default_value = var; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
508 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
509 return NGX_CONF_OK; |
| 589 | 510 } |
| 511 | |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
512 #if (NGX_PCRE) |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
513 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
514 if (value[0].len && value[0].data[0] == '~') { |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
515 ngx_regex_compile_t rc; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
516 ngx_http_map_regex_t *regex; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
517 u_char errstr[NGX_MAX_CONF_ERRSTR]; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
518 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
519 regex = ngx_array_push(&ctx->regexes); |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
520 if (regex == NULL) { |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
521 return NGX_CONF_ERROR; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
522 } |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
523 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
524 value[0].len--; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
525 value[0].data++; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
526 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
527 ngx_memzero(&rc, sizeof(ngx_regex_compile_t)); |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
528 |
|
3930
ace14fd91086
revert r3875 since now map uses case sensetive regexes by default
Igor Sysoev <igor@sysoev.ru>
parents:
3929
diff
changeset
|
529 if (value[0].data[0] == '*') { |
|
ace14fd91086
revert r3875 since now map uses case sensetive regexes by default
Igor Sysoev <igor@sysoev.ru>
parents:
3929
diff
changeset
|
530 value[0].len--; |
|
ace14fd91086
revert r3875 since now map uses case sensetive regexes by default
Igor Sysoev <igor@sysoev.ru>
parents:
3929
diff
changeset
|
531 value[0].data++; |
|
ace14fd91086
revert r3875 since now map uses case sensetive regexes by default
Igor Sysoev <igor@sysoev.ru>
parents:
3929
diff
changeset
|
532 rc.options = NGX_REGEX_CASELESS; |
|
ace14fd91086
revert r3875 since now map uses case sensetive regexes by default
Igor Sysoev <igor@sysoev.ru>
parents:
3929
diff
changeset
|
533 } |
|
ace14fd91086
revert r3875 since now map uses case sensetive regexes by default
Igor Sysoev <igor@sysoev.ru>
parents:
3929
diff
changeset
|
534 |
|
3872
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
535 rc.pattern = value[0]; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
536 rc.err.len = NGX_MAX_CONF_ERRSTR; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
537 rc.err.data = errstr; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
538 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
539 regex->regex = ngx_http_regex_compile(ctx->cf, &rc); |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
540 if (regex->regex == NULL) { |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
541 return NGX_CONF_ERROR; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
542 } |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
543 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
544 regex->value = var; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
545 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
546 return NGX_CONF_OK; |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
547 } |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
548 |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
549 #endif |
|
83cd1910329c
allow regex as "map" parameter
Igor Sysoev <igor@sysoev.ru>
parents:
3792
diff
changeset
|
550 |
|
3791
11701c4c0358
use "\" to escape "default", "include", and "hostnames" values instead of "!"
Igor Sysoev <igor@sysoev.ru>
parents:
3790
diff
changeset
|
551 if (value[0].len && value[0].data[0] == '\\') { |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
552 value[0].len--; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
553 value[0].data++; |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
554 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
555 |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
556 rc = ngx_hash_add_key(&ctx->keys, &value[0], var, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
557 (ctx->hostnames) ? NGX_HASH_WILDCARD_KEY : 0); |
| 589 | 558 |
| 591 | 559 if (rc == NGX_OK) { |
| 560 return NGX_CONF_OK; | |
| 561 } | |
| 589 | 562 |
|
1253
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
563 if (rc == NGX_DECLINED) { |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
564 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
565 "invalid hostname or wildcard \"%V\"", &value[0]); |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
566 } |
|
8ef04207c84f
the "www.example.*" wildcard hash support
Igor Sysoev <igor@sysoev.ru>
parents:
797
diff
changeset
|
567 |
| 591 | 568 if (rc == NGX_BUSY) { |
| 569 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 570 "conflicting parameter \"%V\"", &value[0]); | |
| 571 } | |
| 589 | 572 |
| 591 | 573 return NGX_CONF_ERROR; |
| 589 | 574 } |