diff options
| author | Anatol Belski <ab@php.net> | 2015-05-21 08:21:53 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-05-21 08:21:53 +0200 |
| commit | ad4d022bdf23b087b0d2c84e4941706755467d89 (patch) | |
| tree | 0535f2a4d5f9b800e5e849c645a5f65753364361 | |
| parent | 59a78d48f06de10d927987dd0c940bf3c03dd316 (diff) | |
| parent | 75286ece1a57f17c568b3d531eebc94ec5046a47 (diff) | |
| download | php-git-ad4d022bdf23b087b0d2c84e4941706755467d89.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 9b13b3a27f..07348a23f7 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4120,7 +4120,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 |