diff options
| author | Anatol Belski <ab@php.net> | 2015-07-28 17:42:37 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-07-28 17:42:37 +0200 |
| commit | 9fdb8c2ccd109ddc30bd46f0bd0c493352756b76 (patch) | |
| tree | dde5721b33eb38dd2db58629feabd4a698178222 | |
| parent | 54bf6352fe9424c78edb62defbc8a993bb525910 (diff) | |
| parent | ce5c4500cd942ab85efa1e916ef00de860be9e6e (diff) | |
| download | php-git-9fdb8c2ccd109ddc30bd46f0bd0c493352756b76.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #70002 TS issues with temporary dir handling
| -rw-r--r-- | main/php_open_temporary_file.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c index a18adaa8cd..cbfecca0be 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) { |