diff options
| author | Anatol Belski <ab@php.net> | 2014-10-15 09:37:55 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-15 09:37:55 +0200 |
| commit | c00424e427930a33e6d8645cc3f23fb78ed29b9f (patch) | |
| tree | 83190e6ac9d0714fc971fe0925a0d935414de91c /Zend/zend.c | |
| parent | 382f95e6127d52b079d172ccd017cf306402e015 (diff) | |
| download | php-git-c00424e427930a33e6d8645cc3f23fb78ed29b9f.tar.gz | |
bring back all the TSRMLS_FETCH() stuff
for better comparability with the mainstream
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 8c10125fe3..ab50087a39 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -809,6 +809,8 @@ void zenderror(const char *error) /* {{{ */ BEGIN_EXTERN_C() ZEND_API void _zend_bailout(char *filename, uint lineno) /* {{{ */ { + TSRMLS_FETCH(); + if (!EG(bailout)) { zend_output_debug_string(1, "%s(%d) : Bailed out without a bailout address!", filename, lineno); exit(-1); @@ -974,6 +976,7 @@ static void zend_error_va_list(int type, const char *format, va_list args) zend_stack delayed_oplines_stack; zend_stack context_stack; zend_array *symbol_table; + TSRMLS_FETCH(); /* Report about uncaught exception in case of fatal errors */ if (EG(exception)) { |