restore environ, this fixes segfault on reconfiguration failure when perl module creates new environment
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 17673d0..cd9efbe 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c
@@ -255,11 +255,13 @@ #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 @@ if (module->init_conf(cycle, cycle->conf_ctx[ngx_modules[i]->index]) == NGX_CONF_ERROR) { + environ = senv; ngx_destroy_cycle_pools(&conf); return NULL; }