From 6d2a14aa906b1d576d5151b2410b59cfcab5edd4 Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 27 Sep 2004 16:03:21 +0000
Subject: nginx-0.1.0-2004-09-27-20:03:21 import

---
 src/http/ngx_http_core_module.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/http')

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 58fa59d1e..a40548e18 100644
--- 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_conf(ngx_conf_t *cf,
 
     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;
-- 
cgit