Mercurial > hg > nginx
comparison src/core/ngx_conf_file.c @ 605:5dac8c7fb71b release-0.3.24
nginx-0.3.24-RELEASE import
*) 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; the bug
had appeared in 0.3.18.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 01 Feb 2006 18:22:15 +0000 |
parents | 425af804d968 |
children | 65bf042c0b4f |
comparison
equal
deleted
inserted
replaced
604:f4a6e8f250a8 | 605:5dac8c7fb71b |
---|---|
668 | 668 |
669 old = *name; | 669 old = *name; |
670 | 670 |
671 name->len = cycle->root.len + old.len; | 671 name->len = cycle->root.len + old.len; |
672 | 672 |
673 if (cycle->connections) { | 673 name->data = ngx_palloc(cycle->pool, name->len + 1); |
674 name->data = ngx_palloc(cycle->pool, name->len + 1); | 674 if (name->data == NULL) { |
675 if (name->data == NULL) { | 675 return NGX_ERROR; |
676 return NGX_ERROR; | |
677 } | |
678 | |
679 } else { | |
680 | |
681 /* the init_cycle */ | |
682 | |
683 name->data = ngx_alloc(name->len + 1, cycle->log); | |
684 if (name->data == NULL) { | |
685 return NGX_ERROR; | |
686 } | |
687 } | 676 } |
688 | 677 |
689 p = ngx_cpymem(name->data, cycle->root.data, cycle->root.len), | 678 p = ngx_cpymem(name->data, cycle->root.data, cycle->root.len), |
690 ngx_cpystrn(p, old.data, old.len + 1); | 679 ngx_cpystrn(p, old.data, old.len + 1); |
691 | 680 |