From: Stanislav Malyshev Date: Tue, 30 Mar 2004 16:56:01 +0000 (+0000) Subject: Disabled calling dtors on tsrm_shutdown - calling dtors in tsrm_shutdown makes X-Git-Tag: php-5.0.0RC2RC1~152 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07266a10abde012561f311862da80d660cc31c37;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 112d3cf5c4..b3e5c9b587 100644 --- a/TSRM/TSRM.c +++ b/TSRM/TSRM.c @@ -158,9 +158,17 @@ TSRM_API void tsrm_shutdown(void) next_p = p->next; for (j=0; jcount; j++) { + /* + 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. + 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);