Fixed bug #70002 TS issues with temporary dir handling

diff --git a/NEWS b/NEWS
index a158c5a42b6d7f8e86cdc54ed87af8bf5f4503b0..ffd2a26e3a58e6fdc97b82617ec478f01f2cae61 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 260024625b736f5e08ed703d5bdfa13f3605d88f..7fe28cf38b40e10d330bca449999555c5c6b00b3 100644 (file)
--- 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)
 {