clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ZTS issues.

Browse Source
This commit is contained in:
Sebastian Bergmann 2007-01-05 14:53:30 +00:00
parent 94d1d69569
commit 4e8661438d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/session/mod_files.c
View File

@ -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;
}

2
ext/session/session.c
View File

@ -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;