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

foobar · foobar · commit de6b4c00911c · 2005-09-20T20:56:54.000Z
diff --git 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;
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -1807,8 +1807,11 @@ PHP_FUNCTION(session_write_close)`
`1807`	`1807`
`1808`	`1808`	`PHP_RSHUTDOWN_FUNCTION(session)`
`1809`	`1809`	`{`
`1810`		`- php_session_flush(TSRMLS_C);`
`1811`		`- php_rshutdown_session_globals(TSRMLS_C);`
	`1810`	`+ zend_try {`
	`1811`	`+ php_session_flush(TSRMLS_C);`
	`1812`	`+ php_rshutdown_session_globals(TSRMLS_C);`
	`1813`	`+ } zend_end_try();`
	`1814`	`+`
`1812`	`1815`	`return SUCCESS;`
`1813`	`1816`	`}`
`1814`	`1817`	`/* }}} */`