IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 15:13:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

restore environ, this fixes segfault on reconfiguration failure when

Browse Source 
perl module creates new environment
This commit is contained in:
Igor Sysoev 2009-09-18 09:21:14 +00:00
parent 2d95c3f210
commit 15c149e499
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/ngx_cycle.c
View File

@ -255,11 +255,13 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
#endif #endif
if (ngx_conf_param(&conf) != NGX_CONF_OK) { if (ngx_conf_param(&conf) != NGX_CONF_OK) {
environ = senv;
ngx_destroy_cycle_pools(&conf); ngx_destroy_cycle_pools(&conf);
return NULL; return NULL;
} }
if (ngx_conf_parse(&conf, &cycle->conf_file) != NGX_CONF_OK) { if (ngx_conf_parse(&conf, &cycle->conf_file) != NGX_CONF_OK) {
environ = senv;
ngx_destroy_cycle_pools(&conf); ngx_destroy_cycle_pools(&conf);
return NULL; 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]) if (module->init_conf(cycle, cycle->conf_ctx[ngx_modules[i]->index])
== NGX_CONF_ERROR) == NGX_CONF_ERROR)
{ {
environ = senv;
ngx_destroy_cycle_pools(&conf); ngx_destroy_cycle_pools(&conf);
return NULL; return NULL;
} }