Mercurial > hg > nginx-vendor-1-0
diff src/core/ngx_conf_file.c @ 154:bb61aa162c6b NGINX_0_3_24
nginx 0.3.24
*) Workaround: for bug in FreeBSD kqueue.
*) Bugfix: now a response generated by the "post_action" directive is
not transferred to a client.
*) Bugfix: the memory leaks were occurring if many log files were used.
*) Bugfix: the first "proxy_redirect" directive was working inside one
location.
*) Bugfix: on 64-bit platforms segmentation fault may occurred on start
if the many names were used in the "server_name" directives; bug
appeared in 0.3.18.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 01 Feb 2006 00:00:00 +0300 |
parents | 84910468f6de |
children | 87699398f955 |
line wrap: on
line diff
--- 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, n 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),