diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2016-12-07 19:03:26 +0300 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-12-07 19:03:26 +0300 |
commit | 0a90c428b8be794b9244c8a5f0084f4d19feebbb (patch) | |
tree | c3edbb13f5de37a32f6161aa73f8d4f79834cee6 /src/core | |
parent | 408e49fed64873aa5b7c3affb2a227e15ccee025 (diff) |
Perl: removed special environment handling for the perl module.
In Perl 5.8.6 the default was switched to use putenv() when used as
embedded library unless "PL_use_safe_putenv = 0" is explicitly used
in the code. Therefore, for modern versions of Perl it is no longer
necessary to restore previous environment when calling perl_destruct().
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/ngx_cycle.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index a57991c69..5e95628bf 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -37,7 +37,7 @@ ngx_cycle_t * ngx_init_cycle(ngx_cycle_t *old_cycle) { void *rv; - char **senv, **env; + char **senv; ngx_uint_t i, n; ngx_log_t *log; ngx_time_t *tp; @@ -750,20 +750,9 @@ old_shm_zone_done: if (ngx_process == NGX_PROCESS_MASTER || ngx_is_init_cycle(old_cycle)) { - /* - * perl_destruct() frees environ, if it is not the same as it was at - * perl_construct() time, therefore we save the previous cycle - * environment before ngx_conf_parse() where it will be changed. - */ - - env = environ; - environ = senv; - ngx_destroy_pool(old_cycle->pool); cycle->old_cycle = NULL; - environ = env; - return cycle; } |