From: foobar <sniper@php.net>
Date: Tue, 20 Sep 2005 20:56:54 +0000 (+0000)
Subject: MFH: - Fixed bug #21306 (catch bailouts of write handler during RSHUTDOWN)
X-Git-Tag: php-5.1.0RC2~214
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de6b4c00911c9e81dd3514e76104ff796d9531f3;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 2ee8857ab4..b44e52f566 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1807,8 +1807,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;
 }
 /* }}} */