diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2016-04-20 13:52:21 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2016-04-20 13:52:21 +0300 |
| commit | 650c1c0a7d94d3bb052a93407b6e280df9c265a4 (patch) | |
| tree | bfe549916d99715473f4df0a056cdd499da9b3ab /Zend/zend_execute.c | |
| parent | f4848014837f8c1d577cc5b0d5d29f658b42369f (diff) | |
| download | php-git-650c1c0a7d94d3bb052a93407b6e280df9c265a4.tar.gz | |
Safe execution timeout handling.
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 6ba72b324e..be4b039d89 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2100,22 +2100,17 @@ void zend_free_compiled_variables(zend_execute_data *execute_data) /* {{{ */ } /* }}} */ -#ifdef ZEND_WIN32 static zend_never_inline ZEND_COLD ZEND_NORETURN void ZEND_FASTCALL zend_interrupt(void) /* {{{ */ { zend_timeout(0); } /* }}} */ -# define ZEND_VM_INTERRUPT_CHECK() do { \ +#define ZEND_VM_INTERRUPT_CHECK() do { \ if (UNEXPECTED(EG(timed_out))) { \ zend_interrupt(); \ } \ } while (0) -#else -# define ZEND_VM_INTERRUPT_CHECK() do { \ - } while (0) -#endif /* * Stack Frame Layout (the whole stack frame is allocated at once) |