Optimization of module unloading (temporary modules can be only in the end)

diff --git a/Zend/zend.c b/Zend/zend.c
index fe009ffd7c9dbc9f4471e1d619bb7f13ae097fad..bab26af0d63044ab9af0de8615de5a8397a18eec 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -877,7 +877,7 @@ static int exec_done_cb(zend_module_entry *module TSRMLS_DC)
 void zend_post_deactivate_modules(TSRMLS_D)
 {
        zend_hash_apply(&module_registry, (apply_func_t) exec_done_cb TSRMLS_CC);
-       zend_hash_apply(&module_registry, (apply_func_t) module_registry_unload_temp TSRMLS_CC);
+       zend_hash_reverse_apply(&module_registry, (apply_func_t) module_registry_unload_temp TSRMLS_CC);
 }
 
 

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index b6c034a66879cf8524e968335b6ab013bb19017f..106f4934406b985b945536daa49a11f635d4f072 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -1855,11 +1855,7 @@ int module_registry_cleanup(zend_module_entry *module TSRMLS_DC)
 
 int module_registry_unload_temp(zend_module_entry *module TSRMLS_DC)
 {
-       switch (module->type) {
-               case MODULE_TEMPORARY:
-                       return 1;
-       }
-       return 0;
+       return (module->type == MODULE_TEMPORARY) ? ZEND_HASH_APPLY_REMOVE : ZEND_HASH_APPLY_STOP;
 }