clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MFH: Fixed initialization of tick functions list in ZTS

Browse Source
This commit is contained in:
Arnaud Le Blanc 2009-03-27 02:34:06 +00:00
parent 13061cf0a0
commit 843202cd5c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main/main.c
View File

@ -1623,6 +1623,8 @@ static int php_body_write_wrapper(const char *str, uint str_length)
static void core_globals_ctor(php_core_globals *core_globals TSRMLS_DC)
{
memset(core_globals, 0, sizeof(*core_globals));
php_startup_ticks(TSRMLS_C);
}
/* }}} */
#endif
@ -1643,6 +1645,8 @@ static void core_globals_dtor(php_core_globals *core_globals TSRMLS_DC)
if (core_globals->disable_classes) {
free(core_globals->disable_classes);
}
php_shutdown_ticks(TSRMLS_C);
}
/* }}} */
@ -1783,6 +1787,8 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
#ifdef PHP_WIN32
ts_allocate_id(&php_win32_core_globals_id, sizeof(php_win32_core_globals), (ts_allocate_ctor) php_win32_core_globals_ctor, (ts_allocate_dtor) php_win32_core_globals_dtor);
#endif
#else
php_startup_ticks(TSRMLS_C);
#endif
gc_globals_ctor(TSRMLS_C);
@ -1927,11 +1933,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
zend_set_utility_values(&zuv);
php_startup_sapi_content_types(TSRMLS_C);
if (php_startup_ticks(TSRMLS_C) == FAILURE) {
php_printf("Unable to start PHP ticks\n");
return FAILURE;
}
/* startup extensions staticly compiled in */
if (php_register_internal_extensions_func(TSRMLS_C) == FAILURE) {
php_printf("Unable to start builtin modules\n");
@ -2032,7 +2033,6 @@ void php_module_shutdown(TSRMLS_D)
WSACleanup();
#endif
php_shutdown_ticks(TSRMLS_C);
sapi_flush(TSRMLS_C);
zend_shutdown(TSRMLS_C);