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_execute_API.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_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 2ec9c8dbcc..bd24609d01 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -206,6 +206,8 @@ static int zval_call_destructor(zval *zv TSRMLS_DC) /* {{{ */ static void zend_unclean_zval_ptr_dtor(zval *zv) /* {{{ */ { + TSRMLS_FETCH(); + if (Z_TYPE_P(zv) == IS_INDIRECT) { zv = Z_INDIRECT_P(zv); } @@ -483,6 +485,7 @@ ZEND_API zend_bool zend_is_executing(TSRMLS_D) /* {{{ */ ZEND_API void _zval_ptr_dtor(zval *zval_ptr ZEND_FILE_LINE_DC) /* {{{ */ { + TSRMLS_FETCH(); i_zval_ptr_dtor(zval_ptr ZEND_FILE_LINE_RELAY_CC TSRMLS_CC); } /* }}} */ @@ -1141,6 +1144,8 @@ ZEND_API int zend_eval_string_ex(char *str, zval *retval_ptr, char *string_name, ZEND_API void zend_timeout(int dummy) /* {{{ */ { + TSRMLS_FETCH(); + if (zend_on_timeout) { #ifdef ZEND_SIGNALS /* @@ -1278,6 +1283,8 @@ void zend_shutdown_timeout_thread(void) /* {{{ */ void zend_set_timeout(zend_long seconds, int reset_signals) /* {{{ */ { + TSRMLS_FETCH(); + EG(timeout_seconds) = seconds; #ifdef ZEND_WIN32 |