Fijxu
/
nginx-quic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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().
This commit is contained in:
Maxim Dounin 2016-12-07 19:03:26 +03:00
parent 2beb4754a0
commit 61d665c722
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
auto/lib/perl/conf
View File

@ -12,9 +12,9 @@ NGX_PERL_VER=`$NGX_PERL -v 2>&1 | grep '^This is perl' 2>&1 \
if test -n "$NGX_PERL_VER"; then
echo " + perl version: $NGX_PERL_VER"
if [ "`$NGX_PERL -e 'use 5.006001; print "OK"'`" != "OK" ]; then
if [ "`$NGX_PERL -e 'use 5.008006; print "OK"'`" != "OK" ]; then
echo
echo "$0: error: perl 5.6.1 or higher is required"
echo "$0: error: perl 5.8.6 or higher is required"
echo
exit 1;
@ -76,7 +76,7 @@ if test -n "$NGX_PERL_VER"; then
else
echo
echo "$0: error: perl 5.6.1 or higher is required"
echo "$0: error: perl 5.8.6 or higher is required"
echo
exit 1;

13
src/core/ngx_cycle.c
View File

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