diff options
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 5e911802c9..87717b1984 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -536,9 +536,8 @@ void zend_deactivate(CLS_D ELS_DC) if (setjmp(EG(bailout))==0) { shutdown_scanner(CLS_C); } - if (setjmp(EG(bailout))==0) { - shutdown_executor(ELS_C); - } + /* shutdown_executor() takes care of its own bailout handling */ + shutdown_executor(ELS_C); if (setjmp(EG(bailout))==0) { shutdown_compiler(CLS_C); } |