Mercurial > hg > nginx-vendor-current

comparison src/http/modules/ngx_http_map_module.c @ 686:2e8a942c8872 NGINX_1_3_6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.3.6 *) Feature: the ngx_http_gunzip_filter_module. *) Feature: the "memcached_gzip_flag" directive. *) Feature: the "always" parameter of the "gzip_static" directive. *) Bugfix: in the "limit_req" directive; the bug had appeared in 1.1.14. Thanks to Charles Chen. *) Bugfix: nginx could not be built by gcc 4.7 with -O2 optimization if the --with-ipv6 option was used.
author Igor Sysoev <http://sysoev.ru>
date Wed, 12 Sep 2012 00:00:00 +0400
parents 660139fd80ca
children 88a1b4797f2e
comparison
equal deleted inserted replaced
685:0a9f545d4f4b 686:2e8a942c8872
367 367
368 static char * 368 static char *
369 ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf) 369 ngx_http_map(ngx_conf_t *cf, ngx_command_t *dummy, void *conf)
370 { 370 {
371 ngx_int_t rc, index; 371 ngx_int_t rc, index;
372 ngx_str_t *value, file, name; 372 ngx_str_t *value, name;
373 ngx_uint_t i, key; 373 ngx_uint_t i, key;
374 ngx_http_map_conf_ctx_t *ctx; 374 ngx_http_map_conf_ctx_t *ctx;
375 ngx_http_variable_value_t *var, **vp; 375 ngx_http_variable_value_t *var, **vp;
376 376
377 ctx = cf->ctx; 377 ctx = cf->ctx;
389 "invalid number of the map parameters"); 389 "invalid number of the map parameters");
390 return NGX_CONF_ERROR; 390 return NGX_CONF_ERROR;
391 } 391 }
392 392
393 if (ngx_strcmp(value[0].data, "include") == 0) { 393 if (ngx_strcmp(value[0].data, "include") == 0) {
394 file = value[1]; 394 return ngx_conf_include(cf, dummy, conf);
395
396 if (ngx_conf_full_name(cf->cycle, &file, 1) != NGX_OK) {
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 } 395 }
404 396
405 if (value[1].data[0] == '$') { 397 if (value[1].data[0] == '$') {
406 name = value[1]; 398 name = value[1];
407 name.len--; 399 name.len--;