Mercurial > hg > nginx

diff 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
line wrap: on
line diff
--- 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 
         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_c
     }
 
     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;
         }
     }