diff options
| author | Ondřej Surý <ondrej@sury.org> | 2015-02-20 10:01:00 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2015-02-20 10:01:00 +0100 |
| commit | 347aa01617585e89149414a9763175a19d2dc651 (patch) | |
| tree | 98170e6aeca907f029fe7b5abbbd2e7f2f4a5412 /ext/standard/basic_functions.c | |
| parent | 832b62efb8fceebb220116d8024d945a9bd31d7e (diff) | |
| download | php-upstream.tar.gz | |
New upstream version 5.6.6+dfsgupstream
Diffstat (limited to 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index c6fe61dd5..fdacba249 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2014 The PHP Group | + | Copyright (c) 1997-2015 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -3404,6 +3404,9 @@ static void php_putenv_destructor(putenv_entry *pe) /* {{{ */ unsetenv(pe->key); # elif defined(PHP_WIN32) SetEnvironmentVariable(pe->key, NULL); +# ifndef ZTS + _putenv_s(pe->key, ""); +# endif # else char **env; |