cvs: Zend(PHP_4_3) / zend.c

stas            Thu Apr  8 12:51:19 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /Zend       zend.c 
  Log:
  Fix elusive crash: executor_globals_dtor shouldn't destroy resource dtor
  hash, since this hash is global (GLOBAL - one for all threads) and 
  executor_globals_dtor is called on thread shutdown. 
  Fix destructors_list cleanup call - it can be called last on shutdown 
  since this hash doesn't have dtor
  
  
http://cvs.php.net/diff.php/Zend/zend.c?r1=1.162.2.17&r2=1.162.2.18&ty=u
Index: Zend/zend.c
diff -u Zend/zend.c:1.162.2.17 Zend/zend.c:1.162.2.18
--- Zend/zend.c:1.162.2.17      Sun Mar 14 15:11:35 2004
+++ Zend/zend.c Thu Apr  8 12:51:19 2004
@@ -365,9 +365,6 @@
 {
        zend_shutdown_constants(TSRMLS_C);
        zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
-#ifdef ZTS
-       zend_destroy_rsrc_list_dtors();
-#endif
        zend_ini_shutdown(TSRMLS_C);
 }
 
@@ -555,7 +552,6 @@
 #endif
 #ifndef ZTS
        zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
-       zend_destroy_rsrc_list_dtors();
 #endif 
        zend_hash_graceful_reverse_destroy(&module_registry);
        zend_hash_destroy(GLOBAL_FUNCTION_TABLE);
@@ -572,6 +568,7 @@
        zend_hash_destroy(GLOBAL_CONSTANTS_TABLE);
        free(GLOBAL_CONSTANTS_TABLE);
 #endif
+       zend_destroy_rsrc_list_dtors();
 }
 
 

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