diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_file.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 28e8871ec..a6ef100e0 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -402,7 +402,7 @@ ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev, return NGX_CONF_OK; } - *path = ngx_palloc(cf->pool, sizeof(ngx_path_t)); + *path = ngx_pcalloc(cf->pool, sizeof(ngx_path_t)); if (*path == NULL) { return NGX_CONF_ERROR; } @@ -421,10 +421,6 @@ ngx_conf_merge_path_value(ngx_conf_t *cf, ngx_path_t **path, ngx_path_t *prev, + init->level[1] + (init->level[1] ? 1 : 0) + init->level[2] + (init->level[2] ? 1 : 0); - (*path)->manager = NULL; - (*path)->loader = NULL; - (*path)->conf_file = NULL; - if (ngx_add_path(cf, path) != NGX_OK) { return NGX_CONF_ERROR; } |