com php-src: complete zts fix: ext/session/mod_files.c ex t/standard/file.c main/php_open_temporary_file.h

Commit: 748b37654df5f89c6630e74385e3f8a6fdf26ebe Author: Stanislav Malyshev <stas@php.net> Tue, 29 Jan 2013 12:12:34 -0800 Parents: 78d3e66f3ae4230cee0c28722284948201e001d8 Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=748b37654df5f89c6630e74385e3f8a6fdf26ebe Log: complete zts fix Changed paths: M ext/session/mod_files.c M ext/standard/file.c M main/php_open_temporary_file.h Diff: diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index 1665ba5..053c617 100644 --- a/ext/session/mod_files.c +++ b/ext/session/mod_files.c @@ -266,7 +266,7 @@ PS_OPEN_FUNC(files) if (*save_path == '\0') { /* if save path is an empty string, determine the temporary dir */ - save_path = php_get_temporary_directory(); + save_path = php_get_temporary_directory(TSRMLS_C); if (php_check_open_basedir(save_path TSRMLS_CC)) { return FAILURE; diff --git a/ext/standard/file.c b/ext/standard/file.c index cf8b159..106f5c1 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -2448,7 +2448,7 @@ PHP_FUNCTION(sys_get_temp_dir) if (zend_parse_parameters_none() == FAILURE) { return; } - RETURN_STRING((char *)php_get_temporary_directory(), 1); + RETURN_STRING((char *)php_get_temporary_directory(TSRMLS_C), 1); } /* }}} */ diff --git a/main/php_open_temporary_file.h b/main/php_open_temporary_file.h index e7dce35..75ac0bb 100644 --- a/main/php_open_temporary_file.h +++ b/main/php_open_temporary_file.h @@ -25,7 +25,7 @@ BEGIN_EXTERN_C() PHPAPI FILE *php_open_temporary_file(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC); PHPAPI int php_open_temporary_fd_ex(const char *dir, const char *pfx, char **opened_path_p, zend_bool open_basedir_check TSRMLS_DC); PHPAPI int php_open_temporary_fd(const char *dir, const char *pfx, char **opened_path_p TSRMLS_DC); -PHPAPI const char *php_get_temporary_directory(void); +PHPAPI const char *php_get_temporary_directory(TSRMLS_D); PHPAPI void php_shutdown_temporary_directory(void); END_EXTERN_C()