From e3cab7675801d224d1d5cdbe7f7b76bbaed97c91 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Tue, 20 Aug 2013 21:11:19 +0400 Subject: 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. --- src/http/ngx_http_core_module.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/http/ngx_http_core_module.c') diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 5273fe32c..ffe7fb4fe 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -3686,9 +3686,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) if (prev->root.data == NULL) { ngx_str_set(&conf->root, "html"); - if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &conf->root) - != NGX_OK) - { + if (ngx_conf_full_name(cf->cycle, &conf->root, 0) != NGX_OK) { return NGX_CONF_ERROR; } } @@ -4430,9 +4428,7 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) } if (clcf->root.data[0] != '$') { - if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &clcf->root) - != NGX_OK) - { + if (ngx_conf_full_name(cf->cycle, &clcf->root, 0) != NGX_OK) { return NGX_CONF_ERROR; } } -- cgit