From 4e8661438dc18d258d03ad07d88009621a53df63 Mon Sep 17 00:00:00 2001 From: Sebastian Bergmann Date: Fri, 5 Jan 2007 14:53:30 +0000 Subject: [PATCH] Fix ZTS issues. --- ext/session/mod_files.c | 6 +++--- ext/session/session.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/session/mod_files.c b/ext/session/mod_files.c index a78fe72d80..ee4e23fd78 100644 --- 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 b3b5e962e7..19d9ecf72d 100644 --- 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; -- 2.50.1