commit 15c149e4998a4c2cb5c1a8b759d0fc626032a6c1
author Igor Sysoev <igor@sysoev.ru> Fri Sep 18 09:21:14 2009 +0000
committer Igor Sysoev <igor@sysoev.ru> Fri Sep 18 09:21:14 2009 +0000
tree d041b4fcb0bd53b73564e3701797559e6a2acf9d
parent 2d95c3f2105b6b23c6befb2486ff1a7ec5650e96

restore environ, this fixes segfault on reconfiguration failure when
perl module creates new environment

src/core/ngx_cycle.c

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;
             }