Commit: 1a527397cc5cf6d745205c21d7e34a9e789189f1 Author: Xinchen Hui <larue...@php.net> Wed, 15 Aug 2012 01:25:31 +0800 Parents: 6bafbb9abf3d5050f732fa263b188f0089c52b0e Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1a527397cc5cf6d745205c21d7e34a9e789189f1 Log: better fix & this test pass now Changed paths: M ext/session/mod_user.c M ext/session/tests/bug60634_error_5.phpt Diff: diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c index e18e826..84a28d3 100644 --- a/ext/session/mod_user.c +++ b/ext/session/mod_user.c @@ -111,9 +111,10 @@ PS_CLOSE_FUNC(user) retval = ps_call_handler(PSF(close), 0, NULL TSRMLS_CC); } zend_catch { bailout = 1; - PS(mod_user_implemented) = 0; } zend_end_try(); + PS(mod_user_implemented) = 0; + if (bailout) { if (retval) { zval_ptr_dtor(&retval); @@ -121,8 +122,6 @@ PS_CLOSE_FUNC(user) zend_bailout(); } - PS(mod_user_implemented) = 0; - FINISH; } diff --git a/ext/session/tests/bug60634_error_5.phpt b/ext/session/tests/bug60634_error_5.phpt index 376b65f..8081ab9 100644 --- a/ext/session/tests/bug60634_error_5.phpt +++ b/ext/session/tests/bug60634_error_5.phpt @@ -1,7 +1,5 @@ --TEST-- Bug #60634 (Segmentation fault when trying to die() in SessionHandler::write()) - fatal error in close during exec ---XFAIL-- -Long term low priority bug, working on it --INI-- session.save_path= session.name=PHPSESSID -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
