Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src: Fixed ext/intl/tests/timezone_createDefault_basic.phpt Skip test if directory does not exist Fixed ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt Leftover: Bump version to 5.6.0 Fixed test sapi/cli/tests/006.phpt Fixed compiler reenterability Fixed compiler reenterability Updated NEWS UPdated NEWS Updated NEWS
hasokeric · Nov 16, 2012 · 05317c5 · 05317c5
2 parents 2e6a4a2 + 6311a86
commit 05317c5
Show file tree

Hide file tree

Showing 9 changed files with 369 additions and 353 deletions.
diff --git a/Zend/zend.h b/Zend/zend.h
@@ -22,7 +22,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "2.5.0-dev"
+#define ZEND_VERSION "2.6.0-dev"
 
 #define ZEND_ENGINE_2
 

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -219,6 +219,7 @@ ZEND_API void file_handle_dtor(zend_file_handle *fh) /* {{{ */
 void init_compiler(TSRMLS_D) /* {{{ */
 {
 	CG(active_op_array) = NULL;
+	memset(&CG(context), 0, sizeof(CG(context)));
 	zend_init_compiler_data_structures(TSRMLS_C);
 	zend_init_rsrc_list(TSRMLS_C);
 	zend_hash_init(&CG(filenames_table), 5, NULL, (dtor_func_t) free_estring, 0);