IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

nginx-0.3.25-RELEASE import

Browse Source 
*) Bugfix: the segmentation fault was occurred on start or while
       reconfiguration if there was invalid configuration; the bug had
       appeared in 0.3.24.
This commit is contained in:
Igor Sysoev 2006-02-01 20:01:51 +00:00
parent 988a478464
commit 57cabd6b49
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/xml/nginx/changes.xml
View File

@ -9,6 +9,24 @@
<title lang="en">nginx changelog</title> <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"> <changes ver="0.3.24" date="01.02.2006">
<change type="workaround"> <change type="workaround">

2
src/core/nginx.h
View File

@ -8,7 +8,7 @@
#define _NGINX_H_INCLUDED_ #define _NGINX_H_INCLUDED_
#define NGINX_VER "nginx/0.3.24" #define NGINX_VER "nginx/0.3.25"
#define NGINX_VAR "NGINX" #define NGINX_VAR "NGINX"
#define NGX_OLDPID_EXT ".oldbin" #define NGX_OLDPID_EXT ".oldbin"

5
src/core/ngx_cycle.c
View File

@ -613,7 +613,10 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
static void static void
ngx_destroy_cycle_pools(ngx_conf_t *conf) 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->temp_pool);
ngx_destroy_pool(conf->pool); ngx_destroy_pool(conf->pool);
} }