diff options
| author | Anatol Belski <ab@php.net> | 2014-11-21 09:57:12 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-11-21 09:57:12 +0100 |
| commit | 56fac96bec882ac59a7fc298c98407bf4a17629d (patch) | |
| tree | a45f9badfd4cdfbcf32e819a004dcf06adc9b9db | |
| parent | 502ce90873d1d7ffc0c359b58d7d49691080804e (diff) | |
| download | php-git-56fac96bec882ac59a7fc298c98407bf4a17629d.tar.gz | |
partially fixed bug #66265
NTS mode should additionally use _putenv to satisfy libs like gettext
relying on _getenv. As _putenv isn't thread safe, it wouldn't bring
much for the TS mode as it would change locale across all the threads
and require locking to avoid random fails with concurrent _getenv
calls.
| -rw-r--r-- | ext/standard/basic_functions.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index ace6540a04..cadbb7f2e5 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4138,13 +4138,17 @@ PHP_FUNCTION(putenv) if (putenv(pe.putenv_string) == 0) { /* success */ # else error_code = SetEnvironmentVariable(pe.key, value); -# if _MSC_VER < 1500 - /* Yet another VC6 bug, unset may return env not found */ - if (error_code != 0 || - (error_code == 0 && GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { -# else - if (error_code != 0) { /* success */ -# endif + + if (error_code != 0 +# ifndef ZTS + /* We need both SetEnvironmentVariable and _putenv here as some + dependency lib could use either way to read the environment. + 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 +# endif + ) { /* success */ # endif #endif zend_hash_add(&BG(putenv_ht), pe.key, pe.key_len + 1, (void **) &pe, sizeof(putenv_entry), NULL); |