diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-03-21 08:20:41 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-03-21 08:20:41 +0000 |
| commit | 455a7fcc1ea972a76a63dafc3f30d306431a2013 (patch) | |
| tree | 71a087a4bddd79b3cb31bcaa02574d8da47a484c /src/http/ngx_http_core_module.c | |
| parent | 0443dda3d3f99abc9db8ca2365cdae9132a244ed (diff) | |
| download | nginx-455a7fcc1ea972a76a63dafc3f30d306431a2013.tar.gz nginx-455a7fcc1ea972a76a63dafc3f30d306431a2013.zip | |
nginx-0.3.34-RELEASE importrelease-0.3.34
*) Feature: the "add_header" directive supports the variables.
Diffstat (limited to 'src/http/ngx_http_core_module.c')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 8e9d0b3f0..6e55c4074 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -2012,6 +2012,7 @@ ngx_http_core_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) if (conf->root.data == NULL) { + conf->alias = prev->alias; conf->root = prev->root; conf->root_lengths = prev->root_lengths; conf->root_values = prev->root_values; |