com php-src: Merge branch 'PHP-5.5' into PHP-5.6: main/php_op en_temporary_file.c

From: Date: Thu, 06 Aug 2015 07:23:18 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: main/php_op en_temporary_file.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-88346@lists.php.net to get a copy of this message
Commit: f14dc0519c8d87e8fa18920a86bf8dee42e2b502 Author: Anatol Belski <ab@php.net> Tue, 28 Jul 2015 17:42:37 +0200 Committer: Ferenc Kovacs <tyrael@php.net> Thu, 6 Aug 2015 09:23:18 +0200 Parents: bbc213d3cf5488fdd79caddd76ebf2af10f4ac85 Branches: PHP-5.6.12 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f14dc0519c8d87e8fa18920a86bf8dee42e2b502 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fixed bug #70002 TS issues with temporary dir handling Bugs: https://bugs.php.net/70002 Changed paths: M main/php_open_temporary_file.c Diff: diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c index a18adaa..cbfecca 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) {

« previous php.cvs (#88346) next »