diff options
| author | Anatol Belski <ab@php.net> | 2017-02-18 18:03:55 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-02-18 18:03:55 +0100 |
| commit | ac64eea9e6d63b15043d005b38c04056b63ae159 (patch) | |
| tree | 0bcd30845e7a7618a9e448ec8b8945be4c337755 | |
| parent | 15b8b124ae1017dc31dae46cee73b702d77f85b8 (diff) | |
| parent | 1623ef10c968b2c902f3d4b01955fddeca84dab6 (diff) | |
| download | php-git-ac64eea9e6d63b15043d005b38c04056b63ae159.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
initialize valid_symbol_table, important for the main thread
| -rw-r--r-- | Zend/zend.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 20a82902c6..5672c5c347 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -580,6 +580,7 @@ static void executor_globals_ctor(zend_executor_globals *executor_globals) /* {{ #ifdef ZEND_WIN32 zend_get_windows_version_info(&executor_globals->windows_version_info); #endif + executor_globals->valid_symbol_table = 0; } /* }}} */ |