com php-src: Fixed bug #70002 TS issues with temporary dir handling: NEWS main/php_open_temporary_file.c
| From: | Anatol Belski | Date: | Tue, 28 Jul 2015 15:41:38 +0000 |
| Subject: | com php-src: Fixed bug #70002 TS issues with temporary dir handling: NEWS main/php_open_temporary_file.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88210@lists.php.net to get a copy of this message | ||
Commit: ce5c4500cd942ab85efa1e916ef00de860be9e6e
Author: Anatol Belski <ab@php.net> Tue, 28 Jul 2015 17:41:38 +0200
Parents: daa0abaf77d9be8c2a8af1c9f6d29b749802f2e1
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ce5c4500cd942ab85efa1e916ef00de860be9e6e
Log:
Fixed bug #70002 TS issues with temporary dir handling
Bugs:
https://bugs.php.net/70002
Changed paths:
M NEWS
M main/php_open_temporary_file.c
Diff:
diff --git a/NEWS b/NEWS
index a158c5a..ffd2a26 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 2600246..7fe28cf 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)
{