[PHP-CVS] cvs: php-src(PHP_5_3) /main main.c

[Arnaud Le Blanc]

lbarnaud                Fri Mar 27 02:34:06 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/main       main.c 
  Log:
  MFH: Fixed initialization of tick functions list in ZTS
  
  
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.46&r2=1.640.2.23.2.57.2.47&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.640.2.23.2.57.2.46 
php-src/main/main.c:1.640.2.23.2.57.2.47
--- php-src/main/main.c:1.640.2.23.2.57.2.46    Mon Feb  9 09:20:34 2009
+++ php-src/main/main.c Fri Mar 27 02:34:06 2009
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: main.c,v 1.640.2.23.2.57.2.46 2009/02/09 09:20:34 dmitry Exp $ */
+/* $Id: main.c,v 1.640.2.23.2.57.2.47 2009/03/27 02:34:06 lbarnaud Exp $ */
 
 /* {{{ includes
  */
@@ -1623,6 +1623,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
@@ -1643,6 +1645,8 @@
        if (core_globals->disable_classes) {
                free(core_globals->disable_classes);
        }
+
+       php_shutdown_ticks(TSRMLS_C);
 }
 /* }}} */
 
@@ -1783,6 +1787,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);
 
@@ -1927,11 +1933,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");
@@ -2032,7 +2033,6 @@
        WSACleanup();
 #endif
 
-       php_shutdown_ticks(TSRMLS_C);
        sapi_flush(TSRMLS_C);
 
        zend_shutdown(TSRMLS_C);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php