From: foobar <sniper@php.net>
Date: Tue, 20 Sep 2005 20:59:25 +0000 (+0000)
Subject: MFH: - Fixed bug #21306 (catch bailouts of write handler during RSHUTDOWN)
X-Git-Tag: php-4.4.1RC1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3df5e260ca5c6ce8045bc3418e6692c7cbb84341;p=php

MFH: - Fixed bug #21306 (catch bailouts of write handler during RSHUTDOWN)
---

diff --git a/ext/session/session.c b/ext/session/session.c
index a0d1a5e133..6158b72289 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1680,8 +1680,11 @@ PHP_FUNCTION(session_write_close)
 
 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;
 }
 /* }}} */