diff options
| author | Anatol Belski <ab@php.net> | 2015-05-21 08:22:30 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-05-21 08:22:30 +0200 |
| commit | 360d8fd712141c62d257354da8c00c0738e24fe5 (patch) | |
| tree | f556be7fa3d0d3a118061f0d6325332503107592 | |
| parent | 9b6bb2d451cd43918214ab7d6d9dd7ec8ae0ee3c (diff) | |
| parent | ad4d022bdf23b087b0d2c84e4941706755467d89 (diff) | |
| download | php-git-360d8fd712141c62d257354da8c00c0738e24fe5.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix handling VAR vs VAR= in putenv
| -rw-r--r-- | ext/standard/basic_functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 462a234205..c4e0cee9f1 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4144,7 +4144,7 @@ PHP_FUNCTION(putenv) Obviously the CRT version will be useful more often. But generally, doing both brings us on the safe track at least in NTS build. */ - && _putenv(pe.putenv_string) == 0 + && _putenv_s(pe.key, value ? value : "") == 0 # endif ) { /* success */ # endif |