Mercurial > hg > nginx-quic

diff src/http/ngx_http_core_module.c @ 5317:f1a91825730a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replaced ngx_conf_full_name() with ngx_get_full_name(). The ngx_get_full_name() function takes more readable arguments list.
author Valentin Bartenev <vbart@nginx.com>
date Tue, 06 Aug 2013 19:58:40 +0400
parents 12dd27b74117
children 314c3d7cc3a5
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3686,7 +3686,9 @@ ngx_http_core_merge_loc_conf(ngx_conf_t 
         if (prev->root.data == NULL) {
             ngx_str_set(&conf->root, "html");
 
-            if (ngx_conf_full_name(cf->cycle, &conf->root, 0) != NGX_OK) {
+            if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &conf->root)
+                != NGX_OK)
+            {
                 return NGX_CONF_ERROR;
             }
         }
@@ -4428,7 +4430,9 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_c
     }
 
     if (clcf->root.data[0] != '$') {
-        if (ngx_conf_full_name(cf->cycle, &clcf->root, 0) != NGX_OK) {
+        if (ngx_get_full_name(cf->pool, &cf->cycle->prefix, &clcf->root)
+            != NGX_OK)
+        {
             return NGX_CONF_ERROR;
         }
     }