diff options
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | main/php_open_temporary_file.c | 10 |
2 files changed, 13 insertions, 2 deletions
@@ -1,9 +1,12 @@ -PHP NEWS +PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2015, PHP 5.5.28 ** PHP 5.5 is in security-only mode , please do not commit to this branch ** +- Core: + . Fixed bug #70002 (TS issues with temporary dir handling). (Anatol) + 9 Jul 2015, PHP 5.5.27 - Core: diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c index 260024625b..7fe28cf38b 100644 --- a/main/php_open_temporary_file.c +++ b/main/php_open_temporary_file.c @@ -176,7 +176,15 @@ static int php_do_open_temporary_file(const char *path, const char *pfx, char ** /* }}} */ /* Cache the chosen temporary directory. */ -static char* temporary_directory; +static +#ifdef ZTS +#ifdef PHP_WIN32 +__declspec(thread) +#elif defined(__GNUC__) +__thread +#endif +#endif +char* temporary_directory; PHPAPI void php_shutdown_temporary_directory(void) { |