diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-20 14:20:34 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-20 14:20:34 +0000 |
| commit | 8084d278850b9b4cf4880ed75cf19f04c38b953f (patch) | |
| tree | 9a25327a80e28385e284a968651c876d02813ef5 /Zend/zend.c | |
| parent | 13ac04b8e504ba5b0d531bee43d602e6980e2e20 (diff) | |
| download | php-git-8084d278850b9b4cf4880ed75cf19f04c38b953f.tar.gz | |
Implement a more granular shutdown mechanism for the executor -
prevent corruption of constants and missing destructions of resources
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); } |