mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 04:14:26 +08: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 c9436c200e
commit f005f36cd6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NEWS
View File

@ -52,6 +52,7 @@ PHP NEWS
. Fixed bug #60811 (php-fpm compilation problem). (rasmus)
- SOAP
. Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
. Fixed bug #60887 (SoapClient ignores user_agent option and sends no
User-Agent header). (carloschilazo at gmail dot com)
@ -61,9 +62,6 @@ PHP NEWS
- PDO_Sqlite extension:
. Add createCollation support. (Damien)
- SOAP:
. Fixed basic HTTP authentication for WSDL sub requests. (Dmitry)
- Reflection:
. Fixed bug #60968 (Late static binding doesn't work with
ReflectionMethod::invokeArgs()). (Laruence)
@ -71,6 +69,8 @@ PHP NEWS
- Session:
. Fixed bug #60860 (session.save_handler=user without defined function core
dumps). (Felipe)
. Fixed bug #60634 (Segmentation fault when trying to die() in
SessionHandler::write()). (Ilia)
- Streams:
. Fixed bug #61115 (stream related segfault on fatal error in

8
ext/session/session.c
View File

@ -1512,9 +1512,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);
}
}
/* }}} */
@ -2167,7 +2165,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() */