]> granicus.if.org Git - php/commitdiff
Disabled calling dtors on tsrm_shutdown - calling dtors in tsrm_shutdown makes
authorStanislav Malyshev <stas@php.net>
Tue, 30 Mar 2004 16:54:20 +0000 (16:54 +0000)
committerStanislav Malyshev <stas@php.net>
Tue, 30 Mar 2004 16:54:20 +0000 (16:54 +0000)
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.

TSRM/TSRM.c

index 6ad7d8ac8b1c795170459ce744f30dcf0268c2a6..ac2cca9321298ad8f02a39844e244f53c1746bad 100644 (file)
@@ -158,9 +158,15 @@ TSRM_API void tsrm_shutdown(void)
 
                                next_p = p->next;
                                for (j=0; j<p->count; 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);