diff options
| author | Nikita Popov <nikic@php.net> | 2013-09-29 18:01:18 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2013-09-29 18:01:18 +0200 |
| commit | 1d1fb69c8b703b1d3af0db30a6869f0140d37a51 (patch) | |
| tree | cc86eff955a5ea9a2c808b599f86cf8520c3fdea /Zend/zend.c | |
| parent | f0c1ea1d2e2f7f697d1776f260919cec583fdb5f (diff) | |
| parent | f0c926564c5f7de9462d9ca7bd75014b14a63f56 (diff) | |
| download | php-git-1d1fb69c8b703b1d3af0db30a6869f0140d37a51.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index f9069c8e1b..11baf34c93 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1184,7 +1184,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ * such scripts recursivly, but some CG() variables may be * inconsistent. */ - in_compilation = zend_is_compiling(TSRMLS_C); + in_compilation = CG(in_compilation); if (in_compilation) { saved_class_entry = CG(active_class_entry); CG(active_class_entry) = NULL; @@ -1196,6 +1196,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ SAVE_STACK(declare_stack); SAVE_STACK(list_stack); SAVE_STACK(context_stack); + CG(in_compilation) = 0; } if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL TSRMLS_CC) == SUCCESS) { @@ -1220,6 +1221,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ RESTORE_STACK(declare_stack); RESTORE_STACK(list_stack); RESTORE_STACK(context_stack); + CG(in_compilation) = 1; } if (!EG(user_error_handler)) { |