Mercurial > hg > nginx

diff src/http/ngx_http_core_module.c @ 440:f390d1775430

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.1.0-2004-09-27-20:03:21 import
author Igor Sysoev <igor@sysoev.ru>
date Mon, 27 Sep 2004 16:03:21 +0000
parents 4fe393d82f44
children da8c5707af39
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -1416,6 +1416,10 @@ static char *ngx_http_core_merge_loc_con
 
     ngx_conf_merge_str_value(conf->root, prev->root, "html");
 
+    if (ngx_conf_full_name(cf->cycle, &conf->root) == NGX_ERROR) {
+        return NGX_CONF_ERROR;
+    }
+
     if (conf->types == NULL) {
         if (prev->types) {
             conf->types = prev->types;