diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2006-02-01 20:00:07 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2006-02-01 20:00:07 +0000 |
| commit | 8def6be9dfcb1bb6657b718c40ecad1610cb1bbf (patch) | |
| tree | 2f053599215fc636817a474109e2b5fad56a7cb5 /src/core/ngx_cycle.c | |
| parent | 197bf5935dd72068522d318cfe81fe38fc40530a (diff) | |
| download | nginx-0.3.25.tar.gz | |
Changes with nginx 0.3.25 01 Feb 2006v0.3.25
*) Bugfix: the segmentation fault was occurred on start or while
reconfiguration if there was invalid configuration; bug appeared in
0.3.24.
Diffstat (limited to 'src/core/ngx_cycle.c')
| -rw-r--r-- | src/core/ngx_cycle.c | 5 |
1 files changed, 4 insertions, 1 deletions
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); } |