php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-05 15:12:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility fix for ext/session/tests/session_id_error3.phpt

Browse Source
This commit is contained in:
Dmitry Stogov
2014-04-10 12:29:14 +04:00
parent 23aecd1736
commit 6df6006769
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ext/session/session.c
View File

@@ -1909,15 +1909,22 @@ static PHP_FUNCTION(session_save_path)
Return the current session id. If newid is given, the session id is replaced with newid */
static PHP_FUNCTION(session_id)
{
char *name = NULL;
zend_string *name = NULL;
int name_len, argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc TSRMLS_CC, "|s", &name, &name_len) == FAILURE) {
if (zend_parse_parameters(argc TSRMLS_CC, "|S", &name) == FAILURE) {
return;
}
if (PS(id)) {
RETVAL_STR(STR_COPY(PS(id)));
//??? keep compatibility for "\0" characters
//??? see: ext/session/tests/session_id_error3.phpt
int len = strlen(PS(id)->val);
if (UNEXPECTED(len != PS(id)->len)) {
RETVAL_STR(STR_INIT(PS(id)->val, len, 0));
} else {
RETVAL_STR(STR_COPY(PS(id)));
}
} else {
RETVAL_EMPTY_STRING();
}
@@ -1926,7 +1933,7 @@ static PHP_FUNCTION(session_id)
if (PS(id)) {
STR_RELEASE(PS(id));
}
PS(id) = STR_INIT(name, name_len, 0);
PS(id) = STR_COPY(name);
}
}
/* }}} */