cvs: php-src /ext/session session.c
| From: | Jani Taskinen | Date: | Tue, 20 Sep 2005 20:56:23 +0000 |
| Subject: | cvs: php-src /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34049@lists.php.net to get a copy of this message | ||
sniper Tue Sep 20 16:56:23 2005 EDT
Modified files:
/php-src/ext/session session.c
Log:
- Fixed bug #21306 (catch bailouts of write handler during RSHUTDOWN)
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.420&r2=1.421&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.420 php-src/ext/session/session.c:1.421
--- php-src/ext/session/session.c:1.420 Tue Sep 20 10:05:16 2005
+++ php-src/ext/session/session.c Tue Sep 20 16:56:21 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.420 2005/09/20 14:05:16 stas Exp $ */
+/* $Id: session.c,v 1.421 2005/09/20 20:56:21 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1809,8 +1809,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;
}
/* }}} */