Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 5330:314c3d7cc3a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out f1a91825730a and 7094bd12c1ff. While ngx_get_full_name() might have a bit more descriptive arguments, the ngx_conf_full_name() is generally easier to use when parsing configuration and limits exposure of cycle->prefix / cycle->conf_prefix details.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 20 Aug 2013 21:11:19 +0400
parents f1a91825730a
children 03ff14058272
comparison
equal deleted inserted replaced
5329:00bdc9f08a16 5330:314c3d7cc3a5
3684 conf->root_values = prev->root_values; 3684 conf->root_values = prev->root_values;
3685 3685
3686 if (prev->root.data == NULL) { 3686 if (prev->root.data == NULL) {
3687 ngx_str_set(&conf->root, "html"); 3687 ngx_str_set(&conf->root, "html");
3688 3688
3689 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &conf->root) 3689 if (ngx_conf_full_name(cf->cycle, &conf->root, 0) != NGX_OK) {
3690 != NGX_OK)
3691 {
3692 return NGX_CONF_ERROR; 3690 return NGX_CONF_ERROR;
3693 } 3691 }
3694 } 3692 }
3695 } 3693 }
3696 3694
4428 if (!alias && clcf->root.data[clcf->root.len - 1] == '/') { 4426 if (!alias && clcf->root.data[clcf->root.len - 1] == '/') {
4429 clcf->root.len--; 4427 clcf->root.len--;
4430 } 4428 }
4431 4429
4432 if (clcf->root.data[0] != '$') { 4430 if (clcf->root.data[0] != '$') {
4433 if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &clcf->root) 4431 if (ngx_conf_full_name(cf->cycle, &clcf->root, 0) != NGX_OK) {
4434 != NGX_OK)
4435 {
4436 return NGX_CONF_ERROR; 4432 return NGX_CONF_ERROR;
4437 } 4433 }
4438 } 4434 }
4439 4435
4440 n = ngx_http_script_variables_count(&clcf->root); 4436 n = ngx_http_script_variables_count(&clcf->root);