diff options
| author | Anatol Belski <ab@php.net> | 2015-07-28 17:41:38 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-07-28 17:41:38 +0200 |
| commit | ce5c4500cd942ab85efa1e916ef00de860be9e6e (patch) | |
| tree | 3843d701c898b5988d3901527b7490d30f7d64b2 | |
| parent | daa0abaf77d9be8c2a8af1c9f6d29b749802f2e1 (diff) | |
| download | php-git-ce5c4500cd942ab85efa1e916ef00de860be9e6e.tar.gz | |
Fixed bug #70002 TS issues with temporary dir handling
| -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) { |