From: Stanislav Malyshev Date: Tue, 30 Mar 2004 16:54:20 +0000 (+0000) Subject: Disabled calling dtors on tsrm_shutdown - calling dtors in tsrm_shutdown makes X-Git-Tag: php-4.3.6RC1~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7eed89deb7d54d0b3a83f7331bf53dd544c5d212;p=php Disabled calling dtors on tsrm_shutdown - calling dtors in tsrm_shutdown makes modules registering TSRM ids to crash, if they have dtors, since the module is unloaded before tsrm_shutdown is called. Can be re-enabled after tsrm_free_id is implemented. --- diff --git a/TSRM/TSRM.c b/TSRM/TSRM.c index 6ad7d8ac8b..ac2cca9321 100644 --- a/TSRM/TSRM.c +++ b/TSRM/TSRM.c @@ -158,9 +158,15 @@ TSRM_API void tsrm_shutdown(void) next_p = p->next; for (j=0; jcount; j++) { + /* Disabled - calling dtors in tsrm_shutdown makes + modules registering TSRM ids to crash, if they have + dtors, since the module is unloaded before tsrm_shutdown + is called. Can be re-enabled after tsrm_free_id is + implemented. if (resource_types_table && resource_types_table[j].dtor) { resource_types_table[j].dtor(p->storage[j], &p->storage); } + */ free(p->storage[j]); } free(p->storage);