diff options
| author | Zeev Suraski <zeev@php.net> | 2000-04-24 16:04:13 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-04-24 16:04:13 +0000 |
| commit | dc93a62cbbd0fc3ef49df6ed523df42cfc430664 (patch) | |
| tree | 0cf4e0090bf0994df81fd50905c4e22a57910e65 /Zend/zend_API.c | |
| parent | 9786e4450a11c99ab8524ebdb3e0c48099e3a517 (diff) | |
| download | php-git-dc93a62cbbd0fc3ef49df6ed523df42cfc430664.tar.gz | |
Correct fix
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 81fe8c688f..008b60b373 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -797,6 +797,7 @@ void module_destructor(zend_module_entry *module) if (module->type == MODULE_TEMPORARY) { zend_clean_module_rsrc_dtors(module->module_number); clean_module_constants(module->module_number); + module->request_shutdown_func(module->type, module->module_number); } if (module->module_started && module->module_shutdown_func) { @@ -837,26 +838,24 @@ int module_registry_request_startup(zend_module_entry *module) /* for persistent modules - call request shutdown and flag NOT to erase - * for temporary modules - call request shutdown and flag to erase + * for temporary modules - do nothing, and flag to erase */ int module_registry_cleanup(zend_module_entry *module) { - if (module->request_shutdown_func) { -#if 0 - zend_printf("%s: Request shutdown\n",module->name); -#endif - module->request_shutdown_func(module->type, module->module_number); - } - switch(module->type) { case MODULE_PERSISTENT: + if (module->request_shutdown_func) { +#if 0 + zend_printf("%s: Request shutdown\n",module->name); +#endif + module->request_shutdown_func(module->type, module->module_number); + } return 0; break; case MODULE_TEMPORARY: return 1; break; } - return 0; } |