com php-src: Merge branch 'PHP-7.1': Zend/zend.c

[email protected] (Anatol Belski) Sat, 18 Feb 2017 17:05:55 +0000

Newsgroups	php.cvs
Message-ID	<[email protected]>

Commit:    0c28332b119c42e4d1a360290baa7feb533c5234
Author:    Anatol Belski <[email protected]>         Sat, 18 Feb 2017 18:05:55 +0100
Parents:   5b1300b6c94b346310c0dd1eb3f89fd786229da4 ac64eea9e6d63b15043d005b38c04056b63ae159
Branches:  master

Link:       http://git.php.net/?p=php-src.git;a=commitdiff;h=0c28332b119c42e4d1a360290baa7feb533c5234

Log:
Merge branch 'PHP-7.1'

* PHP-7.1:
  initialize valid_symbol_table, important for the main thread

Changed paths:
  MM  Zend/zend.c


Diff:
diff --cc Zend/zend.c
index c5236ba,5672c5c..bb1bc17
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@@ -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;
  }
  /* }}} */