diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-09-27 16:03:21 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-09-27 16:03:21 +0000 |
| commit | 6d2a14aa906b1d576d5151b2410b59cfcab5edd4 (patch) | |
| tree | 7d8d6d36783a29c4a9ec78e81bb9814155bb355f /src/http/ngx_http_core_module.c | |
| parent | 4bed6e3120eeccc7f3ea97101decd382552a0ffc (diff) | |
| download | nginx-6d2a14aa906b1d576d5151b2410b59cfcab5edd4.tar.gz nginx-6d2a14aa906b1d576d5151b2410b59cfcab5edd4.zip | |
nginx-0.1.0-2004-09-27-20:03:21 import
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |