sniper Tue Sep 20 16:59:26 2005 EDT
Modified files: (Branch: PHP_4_4)
/php-src/ext/session session.c
Log:
MFH: - Fixed bug #21306 (catch bailouts of write handler during RSHUTDOWN)
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.336.2.53.2.1&r2=1.336.2.53.2.2&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.336.2.53.2.1
php-src/ext/session/session.c:1.336.2.53.2.2
--- php-src/ext/session/session.c:1.336.2.53.2.1 Tue Sep 20 10:01:40 2005
+++ php-src/ext/session/session.c Tue Sep 20 16:59:25 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.336.2.53.2.1 2005/09/20 14:01:40 stas Exp $ */
+/* $Id: session.c,v 1.336.2.53.2.2 2005/09/20 20:59:25 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1680,8 +1680,11 @@
PHP_RSHUTDOWN_FUNCTION(session)
{
- php_session_flush(TSRMLS_C);
- php_rshutdown_session_globals(TSRMLS_C);
+ zend_try {
+ php_session_flush(TSRMLS_C);
+ php_rshutdown_session_globals(TSRMLS_C);
+ } zend_end_try();
+
return SUCCESS;
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
