Browse Source

MFZE1 - threading fix

migration/unlabaled-1.1.2
Zeev Suraski 24 years ago
parent
commit
711be83d49
  1. 15
      Zend/zend.c
  2. 4
      Zend/zend.h

15
Zend/zend.c

@ -497,6 +497,21 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i
}
#ifdef ZTS
/* Unlink the global (r/o) copies of the class, function and constant tables,
* and use a fresh r/w copy for the startup thread
*/
void zend_post_startup(TSRMLS_D)
{
zend_compiler_globals *compiler_globals = ts_resource(compiler_globals_id);
compiler_globals_ctor(compiler_globals, tsrm_ls);
zend_startup_constants(TSRMLS_C);
zend_copy_constants(EG(zend_constants), global_constants_table);
}
#endif
void zend_shutdown(TSRMLS_D)
{
#ifdef ZEND_WIN32

4
Zend/zend.h

@ -394,6 +394,10 @@ typedef int (*zend_write_func_t)(const char *str, uint str_length);
int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions);
void zend_shutdown(TSRMLS_D);
#ifdef ZTS
void zend_post_startup(TSRMLS_D);
#endif
void zend_set_utility_values(zend_utility_values *utility_values);
BEGIN_EXTERN_C()

Loading…
Cancel
Save