clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #60634 (Segmentation fault when trying to die() in SessionHandler::write())

Browse Source
This commit is contained in:
Ilia Alshanetsky 2012-03-08 03:31:46 +00:00
parent ac6ea3d067
commit ef61504b35
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -44,6 +44,10 @@ PHP NEWS
. Fixed bug #60948 (mysqlnd FTBFS when -Wformat-security is enabled).
(Johannes)
- Session
. Fixed bug #60634 (Segmentation fault when trying to die() in
SessionHandler::write()). (Ilia)
- SOAP
. Fixed bug #60887 (SoapClient ignores user_agent option and sends no
User-Agent header). (carloschilazo at gmail dot com)

8
ext/session/session.c
View File

@ -1450,9 +1450,7 @@ static void php_session_flush(TSRMLS_D) /* {{{ */
{
if (PS(session_status) == php_session_active) {
PS(session_status) = php_session_none;
zend_try {
php_session_save_current_state(TSRMLS_C);
} zend_end_try();
php_session_save_current_state(TSRMLS_C);
}
}
/* }}} */
@ -2142,7 +2140,9 @@ static PHP_RSHUTDOWN_FUNCTION(session) /* {{{ */
{
int i;
php_session_flush(TSRMLS_C);
zend_try {
php_session_flush(TSRMLS_C);
} zend_end_try();
php_rshutdown_session_globals(TSRMLS_C);
/* this should NOT be done in php_rshutdown_session_globals() */