diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 01:02:25 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 01:02:25 +0400 |
| commit | 0a77dcd4b9046adb7c8f719ded19c5eff0c8976a (patch) | |
| tree | 8fdd3343db9b3a7345ded20de1b20da68bcc1705 /Zend/zend_execute_API.c | |
| parent | 63c057e3313918a800ad7faebdb648216ddba4c0 (diff) | |
| download | php-git-0a77dcd4b9046adb7c8f719ded19c5eff0c8976a.tar.gz | |
Removed EG(in_execution). If EG(currentent_execute_data) is not NULL we are executing something.
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 7e66b64d98..dc23ff85e0 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -150,7 +150,6 @@ void init_executor(TSRMLS_D) /* {{{ */ EG(function_table) = CG(function_table); EG(class_table) = CG(class_table); - EG(in_execution) = 0; EG(in_autoload) = NULL; EG(autoload_func) = NULL; EG(error_handling) = EH_NORMAL; @@ -483,7 +482,7 @@ ZEND_API uint zend_get_executed_lineno(TSRMLS_D) /* {{{ */ ZEND_API zend_bool zend_is_executing(TSRMLS_D) /* {{{ */ { - return EG(in_execution); + return EG(current_execute_data) != 0; } /* }}} */ |