Mercurial > hg > nginx-quic
changeset 607:77cdfe394a94 release-0.3.25
nginx-0.3.25-RELEASE import
*) Bugfix: the segmentation fault was occurred on start or while
reconfiguration if there was invalid configuration; the bug had
appeared in 0.3.24.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 01 Feb 2006 20:01:51 +0000 |
parents | c0a5da7c4044 |
children | a2777592385e |
files | docs/xml/nginx/changes.xml src/core/nginx.h src/core/ngx_cycle.c |
diffstat | 3 files changed, 23 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/xml/nginx/changes.xml +++ b/docs/xml/nginx/changes.xml @@ -9,6 +9,24 @@ <title lang="en">nginx changelog</title> +<changes ver="0.3.25" date="01.02.2006"> + +<change type="bugfix"> +<para lang="ru"> +при неверной конфигурации на старте или во время переконфигурации происходил +segmentation fault; +ошибка появилась в 0.3.24. +</para> +<para lang="en"> +the segmentation fault was occurred on start or while reconfiguration +if there was invalid configuration; +bug appeared in 0.3.24. +</para> +</change> + +</changes> + + <changes ver="0.3.24" date="01.02.2006"> <change type="workaround">
--- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.3.24" +#define NGINX_VER "nginx/0.3.25" #define NGINX_VAR "NGINX" #define NGX_OLDPID_EXT ".oldbin"
--- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -613,7 +613,10 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) static void ngx_destroy_cycle_pools(ngx_conf_t *conf) { - ngx_shm_free(&conf->cycle->shm); + if (conf->cycle->shm.addr) { + ngx_shm_free(&conf->cycle->shm); + } + ngx_destroy_pool(conf->temp_pool); ngx_destroy_pool(conf->pool); }