Fix thread unsafe constants startup

diff --git a/Zend/libzendts.dsp b/Zend/libzendts.dsp
index e4b0221fe469a9674081c78bc93efc8706af1db6..aa3a672ccf32dff35dd1f79c7d5a2c37e8918138 100644 (file)
--- a/Zend/libzendts.dsp
+++ b/Zend/libzendts.dsp
@@ -340,6 +340,10 @@ InputPath=".\zend-scanner.l"
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=.\LICENSE
+# End Source File
+# Begin Source File
+
 SOURCE=.\ZEND_BUGS
 # End Source File
 # Begin Source File

diff --git a/Zend/zend.c b/Zend/zend.c
index 1f948c92f409484a071d268185b23451e4c8a378..19b571acb6a800f9dd238da3a4d634003bea3c95 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -321,10 +321,12 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions)
        compiler_globals_dtor(compiler_globals);
        compiler_globals->function_table = GLOBAL_FUNCTION_TABLE;
        compiler_globals->class_table = GLOBAL_CLASS_TABLE;
-       zend_startup_constants(executor_globals->zend_constants, executor_globals);
-       GLOBAL_CONSTANTS_TABLE = executor_globals->zend_constants;
-       zend_register_standard_constants(ELS_C);
+       zend_startup_constants(EG(zend_constants), executor_globals);
+       GLOBAL_CONSTANTS_TABLE = EG(zend_constants);
+#else
+       zend_startup_constants(EG(zend_constants));
 #endif
+       zend_register_standard_constants(ELS_C);
 
 #ifndef ZTS
        init_resource_plist(ELS_C);