diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-02-01 20:01:51 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2006-02-01 20:01:51 +0000 |
| commit | 57cabd6b49a4bb332d3df6d0c7ea6ae1f2bda474 (patch) | |
| tree | ea369c0a3170bde519eb052822bdc8032506489a | |
| parent | 988a478464493ae8fe3045cd0a1981c3a82da509 (diff) | |
| download | nginx-release-0.3.25.tar.gz nginx-release-0.3.25.zip | |
nginx-0.3.25-RELEASE importrelease-0.3.25
*) Bugfix: the segmentation fault was occurred on start or while
reconfiguration if there was invalid configuration; the bug had
appeared in 0.3.24.
| -rw-r--r-- | docs/xml/nginx/changes.xml | 18 | ||||
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/core/ngx_cycle.c | 5 |
3 files changed, 23 insertions, 2 deletions
diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml index 7ef4dbf97..22d1e0914 100644 --- 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"> diff --git a/src/core/nginx.h b/src/core/nginx.h index c2f9737a7..66df80dff 100644 --- 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" diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 4bff82871..b5941be6f 100644 --- 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); } |