diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-06-23 15:01:23 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-06-23 15:01:23 +0300 |
| commit | d0460d8f6be04fc9493fc7db99d29168b46f3e72 (patch) | |
| tree | 3951381c23545f2ef03d4ca5faf3f50402ffc9f3 /Zend/zend_execute.c | |
| parent | adc95c511495f00cd1a90feff5fff7968e38fc4a (diff) | |
| download | php-git-d0460d8f6be04fc9493fc7db99d29168b46f3e72.tar.gz | |
Turn safe timeout handling into general interrupt handling ability.
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index c8d2f7c513..670dcd2442 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2069,15 +2069,9 @@ void zend_free_compiled_variables(zend_execute_data *execute_data) /* {{{ */ } /* }}} */ -static zend_never_inline ZEND_COLD ZEND_NORETURN void ZEND_FASTCALL zend_interrupt(void) /* {{{ */ -{ - zend_timeout(0); -} -/* }}} */ - #define ZEND_VM_INTERRUPT_CHECK() do { \ - if (UNEXPECTED(EG(timed_out))) { \ - zend_interrupt(); \ + if (UNEXPECTED(EG(vm_interrupt))) { \ + ZEND_VM_INTERRUPT(); \ } \ } while (0) |