Fix ZTS issues.

diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c
index a78fe72d80eea4d86209103cf09ea7a54d0977de..ee4e23fd780fa1b7740f22841a3fa53cbacf279d 100644 (file)
--- a/ext/session/mod_files.c
+++ b/ext/session/mod_files.c
@@ -94,7 +94,7 @@ static int ps_files_valid_key(const char *key)
        return ret;
 }
 
-static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, const char *key)
+static char *ps_files_path_create(char *buf, size_t buflen, ps_files *data, const char *key TSRMLS_DC)
 {
        size_t key_len;
        const char *p;
@@ -180,7 +180,7 @@ static void ps_files_open(ps_files *data, const char *key TSRMLS_DC)
                        PS(invalid_session_id) = 1;
                        return;
                }
-               if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
+               if (!ps_files_path_create(buf, sizeof(buf), data, key TSRMLS_CC)) {
                        return;
                }
 
@@ -430,7 +430,7 @@ PS_DESTROY_FUNC(files)
        char buf[MAXPATHLEN];
        PS_FILES_DATA;
 
-       if (!ps_files_path_create(buf, sizeof(buf), data, key)) {
+       if (!ps_files_path_create(buf, sizeof(buf), data, key TSRMLS_CC)) {
                return FAILURE;
        }
 

diff --git a/ext/session/session.c b/ext/session/session.c
index b3b5e962e7eca9462d6391911862ab916ac1bc53..19d9ecf72d6e3241c1c22a87f721cb042ed7067e 100644 (file)
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1546,7 +1546,7 @@ static PHP_FUNCTION(session_id)
                        int id_len;
                        UErrorCode status = U_ZERO_ERROR;
 
-                       zend_unicode_to_string_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &id, &id_len, name.u, name_len, &status TSRMLS_CC);
+                       zend_unicode_to_string_ex(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), &id, &id_len, name.u, name_len, &status);
 
                        if (U_SUCCESS(status) && id) {
                                PS(id) = id;