cvs: php-src(PHP_5_1) /ext/session session.c
| From: | Jani Taskinen | Date: | Tue, 20 Sep 2005 20:56:55 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34050@lists.php.net to get a copy of this message | ||
sniper Tue Sep 20 16:56:55 2005 EDT
Modified files: (Branch: PHP_5_1)
/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.417.2.1&r2=1.417.2.2&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.417.2.1 php-src/ext/session/session.c:1.417.2.2
--- php-src/ext/session/session.c:1.417.2.1 Tue Sep 20 10:03:29 2005
+++ php-src/ext/session/session.c Tue Sep 20 16:56:54 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.417.2.1 2005/09/20 14:03:29 stas Exp $ */
+/* $Id: session.c,v 1.417.2.2 2005/09/20 20:56:54 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1807,8 +1807,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;
}
/* }}} */