cvs: php-src /ext/session session.c

sniper Fri Sep 23 04:13:57 2005 EDT Modified files: /php-src/ext/session session.c Log: - Improved the fix for #21306 a bit http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.421&r2=1.422&ty=u Index: php-src/ext/session/session.c diff -u php-src/ext/session/session.c:1.421 php-src/ext/session/session.c:1.422 --- php-src/ext/session/session.c:1.421 Tue Sep 20 16:56:21 2005 +++ php-src/ext/session/session.c Fri Sep 23 04:13:57 2005 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.421 2005/09/20 20:56:21 sniper Exp $ */ +/* $Id: session.c,v 1.422 2005/09/23 08:13:57 sniper Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1758,7 +1758,9 @@ static void php_rshutdown_session_globals(TSRMLS_D) { if (PS(mod_data)) { - PS(mod)->s_close(&PS(mod_data) TSRMLS_CC); + zend_try { + PS(mod)->s_close(&PS(mod_data) TSRMLS_CC); + } zend_end_try(); } if (PS(id)) { efree(PS(id)); @@ -1794,9 +1796,11 @@ static void php_session_flush(TSRMLS_D) { - if(PS(session_status)==php_session_active) { - php_session_save_current_state(TSRMLS_C); - PS(session_status)=php_session_none; + 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(); } } @@ -1809,10 +1813,8 @@ PHP_RSHUTDOWN_FUNCTION(session) { - zend_try { - php_session_flush(TSRMLS_C); - php_rshutdown_session_globals(TSRMLS_C); - } zend_end_try(); + php_session_flush(TSRMLS_C); + php_rshutdown_session_globals(TSRMLS_C); return SUCCESS; }