diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-06-26 13:35:07 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-06-26 13:35:07 +0300 |
| commit | caaeb4849aa56cbbdc66ea015c11a58bd47a43ff (patch) | |
| tree | ae79035283e68957177407123d7d342278e021d9 | |
| parent | 24030d54d86e4b54055b9668d90e5680d8167094 (diff) | |
| download | php-git-caaeb4849aa56cbbdc66ea015c11a58bd47a43ff.tar.gz | |
Removed EG(valid_symbol_table). Used EG(active) instead.
| -rw-r--r-- | Zend/zend.c | 1 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 2 | ||||
| -rw-r--r-- | Zend/zend_globals.h | 1 | ||||
| -rw-r--r-- | main/main.c | 4 |
4 files changed, 2 insertions, 6 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index a6677099a5..0cb0cc7d41 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -638,7 +638,6 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{ zend_get_windows_version_info(&executor_globals->windows_version_info); #endif executor_globals->flags = EG_FLAGS_INITIAL; - executor_globals->valid_symbol_table = 0; } /* }}} */ diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 302a7828eb..5e02b78af1 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -146,7 +146,6 @@ void init_executor(void) /* {{{ */ zend_vm_stack_init(); zend_hash_init(&EG(symbol_table), 64, NULL, ZVAL_PTR_DTOR, 0); - EG(valid_symbol_table) = 1; zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_activator); @@ -267,7 +266,6 @@ void shutdown_executor(void) /* {{{ */ /* All resources and objects are destroyed. */ /* No PHP callback functions may be called after this point. */ EG(active) = 0; - EG(valid_symbol_table) = 0; zend_try { zend_llist_apply(&zend_extensions, (llist_apply_func_t) zend_extension_deactivator); diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 151f47c71f..c026b30d34 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -208,7 +208,6 @@ struct _zend_executor_globals { struct _zend_module_entry *current_module; zend_bool active; - zend_bool valid_symbol_table; zend_uchar flags; zend_long assertions; diff --git a/main/main.c b/main/main.c index d6dee64e67..90dc78d8b4 100644 --- a/main/main.c +++ b/main/main.c @@ -908,7 +908,7 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ efree(docref_buf); } - if (PG(track_errors) && module_initialized && EG(valid_symbol_table) && + if (PG(track_errors) && module_initialized && EG(active) && (Z_TYPE(EG(user_error_handler)) == IS_UNDEF || !(EG(user_error_handler_error_reporting) & type))) { zval tmp; ZVAL_STRINGL(&tmp, buffer, buffer_len); @@ -1235,7 +1235,7 @@ static ZEND_COLD void php_error_cb(int type, const char *error_filename, const u return; } - if (PG(track_errors) && module_initialized && EG(valid_symbol_table)) { + if (PG(track_errors) && module_initialized && EG(active)) { zval tmp; ZVAL_STRINGL(&tmp, buffer, buffer_len); |