php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-08 00:22:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix thread unsafe constants startup

Browse Source
This commit is contained in:
Andi Gutmans
1999-07-14 19:49:19 +00:00
parent 2beb929311
commit 762158aa65
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/libzendts.dsp
View File

@@ -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

8
Zend/zend.c
View File

@@ -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);