Fixed bug #42135 (Second call of session_start() causes creation of SID)

This commit is contained in:
Ilia Alshanetsky 2007-07-29 14:43:30 +00:00
parent 7d8734e5ca
commit 3034092111
2 changed files with 5 additions and 3 deletions

2
NEWS
View File

@ -70,6 +70,8 @@ PHP NEWS
- Fixed PECL bug #11216 (crash in ZipArchive::addEmptyDir when a directory
already exists). (Pierre)
- Fixed bug #42135 (Second call of session_start() causes creation of SID).
(Ilia)
- Fixed Bug #42112 (deleting a node produces memory corruption). (Rob)
- Fixed Bug #42107 (sscanf broken when using %2$s format parameters). (Jani)
- Fixed bug #42090 (json_decode causes segmentation fault). (Hannes)

View File

@ -1221,10 +1221,7 @@ PHPAPI void php_session_start(TSRMLS_D)
PS(apply_trans_sid) = PS(use_trans_sid);
PS(define_sid) = 1;
PS(send_cookie) = 1;
if (PS(session_status) != php_session_none) {
if (PS(session_status) == php_session_disabled) {
char *value;
@ -1241,6 +1238,9 @@ PHPAPI void php_session_start(TSRMLS_D)
php_error(E_NOTICE, "A session had already been started - ignoring session_start()");
return;
} else {
PS(define_sid) = 1;
PS(send_cookie) = 1;
}
lensess = strlen(PS(session_name));