Fix non thread-safe mode - asp_tags/short_tags etc weren't getting initialized properly

diff --git a/Zend/Zend.dsp b/Zend/Zend.dsp
index 6ea89584802fbcc142c05d1e2aa8357bedfefb7a..e1d2fc212dde4b581c6f82295dc7a2b273c46482 100644 (file)
--- a/Zend/Zend.dsp
+++ b/Zend/Zend.dsp
@@ -151,6 +151,10 @@ SOURCE=.\zend_extensions.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\zend_gcc_inline.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\zend_hash.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/Zend/zend.c b/Zend/zend.c
index a3194731048f366df2514f2cd74f2e497cc31744..b0a070d6941d57524463fdc256b0cc46b5735551 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -243,6 +243,16 @@ static void register_standard_class(void)
 }
 
 
+static void zend_set_default_compile_time_values(CLS_D)
+{
+       /* default compile-time values */
+       CG(asp_tags) = 0;
+       CG(short_tags) = 1;
+       CG(allow_call_time_pass_reference) = 1;
+       CG(extended_info) = 0;
+}
+
+
 #ifdef ZTS
 static void compiler_globals_ctor(zend_compiler_globals *compiler_globals)
 {
@@ -257,12 +267,7 @@ static void compiler_globals_ctor(zend_compiler_globals *compiler_globals)
        zend_hash_init(compiler_globals->class_table, 10, NULL, ZEND_CLASS_DTOR, 1);
        zend_hash_copy(compiler_globals->class_table, global_class_table, (copy_ctor_func_t) zend_class_add_ref, &tmp_class, sizeof(zend_class_entry));
 
-       compiler_globals->extended_info = 0;
-
-       /* default compile-time values */
-       compiler_globals->asp_tags = 0;
-       compiler_globals->short_tags = 1;
-       compiler_globals->allow_call_time_pass_reference = 1;
+       zend_set_default_compile_time_values(CLS_C);
 }
 
 
@@ -374,6 +379,7 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
        GLOBAL_CONSTANTS_TABLE = EG(zend_constants);
 #else
        zend_startup_constants();
+       zend_set_default_compile_time_values(CLS_C);
 #endif
        zend_register_standard_constants(ELS_C);