cvs: php-src /main main.c

lbarnaud Fri Mar 27 02:33:44 2009 UTC Modified files: /php-src/main main.c Log: Fixed initialization of tick functions list in ZTS http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.794&r2=1.795&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.794 php-src/main/main.c:1.795 --- php-src/main/main.c:1.794 Tue Mar 10 23:39:53 2009 +++ php-src/main/main.c Fri Mar 27 02:33:44 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.794 2009/03/10 23:39:53 helly Exp $ */ +/* $Id: main.c,v 1.795 2009/03/27 02:33:44 lbarnaud Exp $ */ /* {{{ includes */ @@ -1728,6 +1728,8 @@ 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 @@ -1754,6 +1756,8 @@ if (core_globals->allow_url_include_list) { free(core_globals->allow_url_include_list); } + + php_shutdown_ticks(TSRMLS_C); } /* }}} */ @@ -1893,6 +1897,8 @@ #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); @@ -2050,11 +2056,6 @@ 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"); @@ -2155,7 +2156,6 @@ WSACleanup(); #endif - php_shutdown_ticks(TSRMLS_C); sapi_flush(TSRMLS_C); zend_shutdown(TSRMLS_C);