diff options
Diffstat (limited to 'src/core/ngx_conf_file.c')
-rw-r--r-- | src/core/ngx_conf_file.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index 589eb0e00..ab097c049 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -670,20 +670,9 @@ ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name) name->len = cycle->root.len + old.len; - if (cycle->connections) { - name->data = ngx_palloc(cycle->pool, name->len + 1); - if (name->data == NULL) { - return NGX_ERROR; - } - - } else { - - /* the init_cycle */ - - name->data = ngx_alloc(name->len + 1, cycle->log); - if (name->data == NULL) { - return NGX_ERROR; - } + name->data = ngx_palloc(cycle->pool, name->len + 1); + if (name->data == NULL) { + return NGX_ERROR; } p = ngx_cpymem(name->data, cycle->root.data, cycle->root.len), |