]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorAnatol Belski <ab@php.net>
Sat, 18 Feb 2017 17:05:55 +0000 (18:05 +0100)
committerAnatol Belski <ab@php.net>
Sat, 18 Feb 2017 17:05:55 +0000 (18:05 +0100)
* PHP-7.1:
  initialize valid_symbol_table, important for the main thread

1  2 
Zend/zend.c

diff --cc Zend/zend.c
index c5236ba7ea6dd546f40ecfc2b52a47551082ec83,5672c5c3478ae531e7d5dfb40920949a8b519bb3..bb1bc174b015f432ef41fbb3a6151dc3d28e12ce
@@@ -648,7 -580,7 +648,8 @@@ static void executor_globals_ctor(zend_
  #ifdef ZEND_WIN32
        zend_get_windows_version_info(&executor_globals->windows_version_info);
  #endif
 +      executor_globals->flags = EG_FLAGS_INITIAL;
+       executor_globals->valid_symbol_table = 0;
  }
  /* }}} */