diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-15 01:25:31 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-15 01:25:31 +0800 |
| commit | 1a527397cc5cf6d745205c21d7e34a9e789189f1 (patch) | |
| tree | 2bf8e47a2a67339a783d86c59ca266b5e0c46e1e | |
| parent | 6bafbb9abf3d5050f732fa263b188f0089c52b0e (diff) | |
| download | php-git-1a527397cc5cf6d745205c21d7e34a9e789189f1.tar.gz | |
better fix & this test pass now
| -rw-r--r-- | ext/session/mod_user.c | 5 | ||||
| -rw-r--r-- | ext/session/tests/bug60634_error_5.phpt | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c index e18e826ceb..84a28d3427 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 376b65f20b..8081ab988a 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 |