From ce5c4500cd942ab85efa1e916ef00de860be9e6e Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Tue, 28 Jul 2015 17:41:38 +0200
Subject: Fixed bug #70002 TS issues with temporary dir handling

---
 NEWS                           |  5 ++++-
 main/php_open_temporary_file.c | 10 +++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index a158c5a42b..ffd2a26e3a 100644
--- 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 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)
 {
-- 
cgit v1.2.1