summaryrefslogtreecommitdiff
path: root/TSRM/TSRM.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2004-03-30 16:56:01 +0000
committerStanislav Malyshev <stas@php.net>2004-03-30 16:56:01 +0000
commit07266a10abde012561f311862da80d660cc31c37 (patch)
treeca591c5ee845ab787d7523b7a4e3022a657bcfd0 /TSRM/TSRM.c
parent04d178f79c9a22bcae301e35d31a2b6b25ef21c3 (diff)
downloadphp-git-07266a10abde012561f311862da80d660cc31c37.tar.gz
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.
Diffstat (limited to 'TSRM/TSRM.c')
-rw-r--r--TSRM/TSRM.c8
1 files changed, 8 insertions, 0 deletions
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; j<p->count; 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);