Fix hashtable inconsist when specify an invalid path to ini: phar.cac…

…he_list This fixed the following failed tests(This is PHP-5.3 only): Phar: copy-on-write test 13 [cache_list] [ext/phar/tests/cache_list/copyonwrite13.phar.phpt] Phar: copy-on-write test 14 [cache_list] [ext/phar/tests/cache_list/copyonwrite14.phar.phpt] Phar: copy-on-write test 21 [cache_list] [ext/phar/tests/cache_list/copyonwrite21.phar.phpt] Phar: copy-on-write test 22 [cache_list] [ext/phar/tests/cache_list/copyonwrite22.phar.phpt] Phar: copy-on-write test 4a [cache_list] [ext/phar/tests/cache_list/copyonwrite4a.phpt] Phar front controller other [ext/phar/tests/cache_list/frontcontroller1.phpt] Phar front controller mime type extension is not a string [cache_list] [ext/phar/tests/cache_list/frontcontroller11.phpt] Phar front controller PHP test [cache_list] [ext/phar/tests/cache_list/frontcontroller2.phpt] Phar: phpinfo display 3 [ext/phar/tests/phpinfo_003.phpt]
php · Aug 10, 2012 · 3a083f2 · 3a083f2
1 parent c4b26cc
commit 3a083f2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -3751,8 +3751,6 @@ PHP_RINIT_FUNCTION(basic) /* {{{ */
 	/* Default to global filters only */
 	FG(stream_filters) = NULL;
 
-	FG(wrapper_errors) = NULL;
-
 	return SUCCESS;
 }
 /* }}} */

diff --git a/ext/standard/file.c b/ext/standard/file.c
@@ -162,6 +162,7 @@ static void file_globals_ctor(php_file_globals *file_globals_p TSRMLS_DC)
 	FG(pclose_ret) = 0;
 	FG(user_stream_current_filename) = NULL;
 	FG(def_chunk_size) = PHP_SOCK_CHUNK_SIZE;
+	FG(wrapper_errors) = NULL;
 }
 
 static void file_globals_dtor(php_file_globals *file_globals_p TSRMLS_DC)