From 15c149e4998a4c2cb5c1a8b759d0fc626032a6c1 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Fri, 18 Sep 2009 09:21:14 +0000 Subject: [PATCH] restore environ, this fixes segfault on reconfiguration failure when perl module creates new environment --- src/core/ngx_cycle.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 17673d082..cd9efbee7 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -255,11 +255,13 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) #endif if (ngx_conf_param(&conf) != NGX_CONF_OK) { + environ = senv; ngx_destroy_cycle_pools(&conf); return NULL; } if (ngx_conf_parse(&conf, &cycle->conf_file) != NGX_CONF_OK) { + environ = senv; ngx_destroy_cycle_pools(&conf); return NULL; } @@ -280,6 +282,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) if (module->init_conf(cycle, cycle->conf_ctx[ngx_modules[i]->index]) == NGX_CONF_ERROR) { + environ = senv; ngx_destroy_cycle_pools(&conf); return NULL; }