complete zts fix

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index 1665ba53aa439ab299f7f1cc89112c84f277281d..053c617dec232634059b0c374fee6b15e73c708c 100644 (file)
--- 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 cf8b159556e94b306bde4fc90aedef9314ecf981..106f5c1004ec9aa07f1d26aa0dfd1a1beca14856 100644 (file)
--- 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 e7dce359bb92b563d6757e88849a7edbacb14795..75ac0bb0fea32a383dd70cb653e4bada88c53e34 100644 (file)
--- 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()