diff options
| author | Andi Gutmans <andi@php.net> | 1999-07-14 19:49:19 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 1999-07-14 19:49:19 +0000 |
| commit | 762158aa65e6641af6f2d1a7d652ce56ea7a5487 (patch) | |
| tree | 55ee23938fa96e3d0873cd87acdb59eb19a91653 | |
| parent | 2beb929311983586e324c02a843d67a3e11aada2 (diff) | |
| download | php-git-762158aa65e6641af6f2d1a7d652ce56ea7a5487.tar.gz | |
Fix thread unsafe constants startup
| -rw-r--r-- | Zend/libzendts.dsp | 4 | ||||
| -rw-r--r-- | Zend/zend.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Zend/libzendts.dsp b/Zend/libzendts.dsp index e4b0221fe4..aa3a672ccf 100644 --- 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 1f948c92f4..19b571acb6 100644 --- 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); |