cvs: php4 /ext/aspell aspell.c /ext/bz2 bz2.c /ext/com COM.c /ext/cpdf cpdf.c /ext/curl curl.c /ext/db db.c /ext/dba dba.c /ext/dbase dbase.c
/ext/domxml php_domxml.c /ext/fdf fdf.c /ext/ftp php_ftp.c /ext/gd gd.c /ext/hyperwave hw.c /ext/icap php_icap.c /ext/imap php_imap.c
/ext/ingres_ii ii.c /ext/interbase interbase.c /ext/java java.c /ext/ldap ldap.c /ext/mcal php_mcal.c /ext/msql php_msql.c /ext/mssql
php_mssql.c /ext/mysql php_mysql.c /ext/oci8 oci8.c /ext/odbc php_odbc.c velocis.c /ext/oracle oracle.c /ext/pdf pdf.c /ext/pgsql pgsql.c
/ext/pspell pspell.c /ext/sablot sablot.c /ext/shmop shmop.c /ext/sockets sockets.c /ext/standard dir.c file.c /ext/sybase php_sybase_db.c
/ext/sybase_ct php_sybase_ct.c /ext/sysvsem sysvsem.c /ext/sysvshm sysvshm.c /ext/wddx wddx.c /ext/xml xml.c /ext/zlib zlib.c
| From: | Andrei Zmievski | Date: | Wed, 25 Oct 2000 17:44:06 +0000 |
| Subject: | cvs: php4 /ext/aspell aspell.c /ext/bz2 bz2.c /ext/com COM.c /ext/cpdf cpdf.c /ext/curl curl.c /ext/db db.c /ext/dba dba.c /ext/dbase dbase.c /ext/domxml php_domxml.c /ext/fdf fdf.c /ext/ftp php_ftp.c /ext/gd gd.c /ext/hyperwave hw.c /ext/icap php_icap.c /ext/imap php_imap.c /ext/ingres_ii ii.c /ext/interbase interbase.c /ext/java java.c /ext/ldap ldap.c /ext/mcal php_mcal.c /ext/msql php_msql.c /ext/mssql php_mssql.c /ext/mysql php_mysql.c /ext/oci8 oci8.c /ext/odbc php_odbc.c velocis.c /ext/oracle oracle.c /ext/pdf pdf.c /ext/pgsql pgsql.c /ext/pspell pspell.c /ext/sablot sablot.c /ext/shmop shmop.c /ext/sockets sockets.c /ext/standard dir.c file.c /ext/sybase php_sybase_db.c /ext/sybase_ct php_sybase_ct.c /ext/sysvsem sysvsem.c /ext/sysvshm sysvshm.c /ext/wddx wddx.c /ext/xml xml.c /ext/zlib zlib.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2258@lists.php.net to get a copy of this message | ||
andrei Wed Oct 25 10:44:06 2000 EDT
Modified files:
/php4/ext/aspell aspell.c
/php4/ext/bz2 bz2.c
/php4/ext/com COM.c
/php4/ext/cpdf cpdf.c
/php4/ext/curl curl.c
/php4/ext/db db.c
/php4/ext/dba dba.c
/php4/ext/dbase dbase.c
/php4/ext/domxml php_domxml.c
/php4/ext/fdf fdf.c
/php4/ext/ftp php_ftp.c
/php4/ext/gd gd.c
/php4/ext/hyperwave hw.c
/php4/ext/icap php_icap.c
/php4/ext/imap php_imap.c
/php4/ext/ingres_ii ii.c
/php4/ext/interbase interbase.c
/php4/ext/java java.c
/php4/ext/ldap ldap.c
/php4/ext/mcal php_mcal.c
/php4/ext/msql php_msql.c
/php4/ext/mssql php_mssql.c
/php4/ext/mysql php_mysql.c
/php4/ext/oci8 oci8.c
/php4/ext/odbc php_odbc.c velocis.c
/php4/ext/oracle oracle.c
/php4/ext/pdf pdf.c
/php4/ext/pgsql pgsql.c
/php4/ext/pspell pspell.c
/php4/ext/sablot sablot.c
/php4/ext/shmop shmop.c
/php4/ext/sockets sockets.c
/php4/ext/standard dir.c file.c
/php4/ext/sybase php_sybase_db.c
/php4/ext/sybase_ct php_sybase_ct.c
/php4/ext/sysvsem sysvsem.c
/php4/ext/sysvshm sysvshm.c
/php4/ext/wddx wddx.c
/php4/ext/xml xml.c
/php4/ext/zlib zlib.c
Log:
Use zend_register_list_destructors_ex() instead.
Index: php4/ext/aspell/aspell.c diff -u php4/ext/aspell/aspell.c:1.23 php4/ext/aspell/aspell.c:1.24 --- php4/ext/aspell/aspell.c:1.23 Fri Oct 20 11:24:55 2000 +++ php4/ext/aspell/aspell.c Wed Oct 25 10:43:48 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aspell.c,v 1.23 2000/10/20 18:24:55 andrei Exp $ */ +/* $Id: aspell.c,v 1.24 2000/10/25 17:43:48 andrei Exp $ */ #include "php.h" @@ -61,7 +61,7 @@ PHP_MINIT_FUNCTION(aspell) { - le_aspell = register_list_destructors(php_aspell_close,NULL,"aspell"); + le_aspell = zend_register_list_destructors_ex(php_aspell_close, NULL, "aspell", module_number); return SUCCESS; } Index: php4/ext/bz2/bz2.c diff -u php4/ext/bz2/bz2.c:1.4 php4/ext/bz2/bz2.c:1.5 --- php4/ext/bz2/bz2.c:1.4 Mon Oct 23 06:37:25 2000 +++ php4/ext/bz2/bz2.c Wed Oct 25 10:43:48 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.4 2000/10/23 13:37:25 andrei Exp $ */ +/* $Id: bz2.c,v 1.5 2000/10/25 17:43:48 andrei Exp $ */ #include "php.h" @@ -70,7 +70,7 @@ PHP_MINIT_FUNCTION(bz2) { - le_bz2 = register_list_destructors(_php_bz2_close_handle, NULL,"bzip2"); + le_bz2 = zend_register_list_destructors_ex(_php_bz2_close_handle, NULL, "bzip2", module_number); return SUCCESS; } Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.40 php4/ext/com/COM.c:1.41 --- php4/ext/com/COM.c:1.40 Fri Oct 20 11:24:57 2000 +++ php4/ext/com/COM.c Wed Oct 25 10:43:48 2000 @@ -227,7 +227,7 @@ PHP_MINIT_FUNCTION(COM) { CoInitialize(NULL); - le_idispatch = register_list_destructors(php_idispatch_destructor, NULL,"COM"); + le_idispatch = zend_register_list_destructors_ex(php_idispatch_destructor, NULL, "COM", module_number); php_register_COM_class(); REGISTER_INI_ENTRIES(); return SUCCESS; Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.20 php4/ext/cpdf/cpdf.c:1.21 --- php4/ext/cpdf/cpdf.c:1.20 Fri Oct 20 11:24:58 2000 +++ php4/ext/cpdf/cpdf.c Wed Oct 25 10:43:49 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.20 2000/10/20 18:24:58 andrei Exp $ */ +/* $Id: cpdf.c,v 1.21 2000/10/25 17:43:49 andrei Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -174,8 +174,8 @@ PHP_MINIT_FUNCTION(cpdf) { - CPDF_GLOBAL(le_outline) = register_list_destructors(_free_outline, NULL,"cpdf outline"); - CPDF_GLOBAL(le_cpdf) = register_list_destructors(_free_doc, NULL,"cpdf"); + CPDF_GLOBAL(le_outline) = zend_register_list_destructors_ex(_free_outline, NULL, "cpdf outline", module_number); + CPDF_GLOBAL(le_cpdf) = zend_register_list_destructors_ex(_free_doc, NULL, "cpdf", module_number); return SUCCESS; } Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.19 php4/ext/curl/curl.c:1.20 --- php4/ext/curl/curl.c:1.19 Sun Oct 22 10:29:33 2000 +++ php4/ext/curl/curl.c Wed Oct 25 10:43:49 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.19 2000/10/22 17:29:33 sniper Exp $ */ +/* $Id: curl.c,v 1.20 2000/10/25 17:43:49 andrei Exp $ */ #include "php.h" @@ -134,7 +134,7 @@ PHP_MINIT_FUNCTION(curl) { - le_curl = register_list_destructors(_php_curl_close, NULL, "curl"); + le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number); /* Constants for curl_setopt() */ REGISTER_LONG_CONSTANT("CURLOPT_PORT", CURLOPT_PORT, CONST_CS | CONST_PERSISTENT); Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.44 php4/ext/db/db.c:1.45 --- php4/ext/db/db.c:1.44 Fri Oct 20 11:24:58 2000 +++ php4/ext/db/db.c Wed Oct 25 10:43:49 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.44 2000/10/20 18:24:58 andrei Exp $ */ +/* $Id: db.c,v 1.45 2000/10/25 17:43:49 andrei Exp $ */ #define IS_EXT_MODULE #if 1 @@ -1122,7 +1122,7 @@ } #endif - le_db = register_list_destructors(php_dbm_close,NULL,"dbm"); + le_db = zend_register_list_destructors_ex(php_dbm_close, NULL, "dbm", module_number); return SUCCESS; } Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.23 php4/ext/dba/dba.c:1.24 --- php4/ext/dba/dba.c:1.23 Sat Oct 21 05:03:09 2000 +++ php4/ext/dba/dba.c Wed Oct 25 10:43:49 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.23 2000/10/21 12:03:09 rasmus Exp $ */ +/* $Id: dba.c,v 1.24 2000/10/25 17:43:49 andrei Exp $ */ #include "php.h" @@ -190,8 +190,8 @@ static PHP_MINIT_FUNCTION(dba) { zend_hash_init(&ht_keys, 0, NULL, NULL, 1); - GLOBAL(le_db) = register_list_destructors(dba_close, NULL,"dba"); - GLOBAL(le_pdb) = register_list_destructors(NULL, dba_close,"dba persistent"); + GLOBAL(le_db) = zend_register_list_destructors_ex(dba_close, NULL, "dba", module_number); + GLOBAL(le_pdb) = zend_register_list_destructors_ex(NULL, dba_close, "dba persistent", module_number); return SUCCESS; } @@ -207,7 +207,7 @@ dba_handler *hptr; php_info_print_box_start(0); - PUTS("V1 ($Id: dba.c,v 1.23 2000/10/21 12:03:09 rasmus Exp $)"); + PUTS("V1 ($Id: dba.c,v 1.24 2000/10/25 17:43:49 andrei Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name); Index: php4/ext/dbase/dbase.c diff -u php4/ext/dbase/dbase.c:1.32 php4/ext/dbase/dbase.c:1.33 --- php4/ext/dbase/dbase.c:1.32 Fri Oct 20 11:24:59 2000 +++ php4/ext/dbase/dbase.c Wed Oct 25 10:43:50 2000 @@ -82,7 +82,7 @@ TlsSetValue(DbaseTls, (void *) dbase_globals); #endif DBase_GLOBAL(le_dbhead) = - register_list_destructors(_close_dbase,NULL,"dbase"); + zend_register_list_destructors_ex(_close_dbase, NULL, "dbase", module_number); return SUCCESS; } Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.11 php4/ext/domxml/php_domxml.c:1.12 --- php4/ext/domxml/php_domxml.c:1.11 Fri Oct 20 11:24:59 2000 +++ php4/ext/domxml/php_domxml.c Wed Oct 25 10:43:50 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.11 2000/10/20 18:24:59 andrei Exp $ */ +/* $Id: php_domxml.c,v 1.12 2000/10/25 17:43:50 andrei Exp $ */ #include "php.h" @@ -133,12 +133,12 @@ domxmltestnode_class_startup(); #endif - le_domxmldocp = register_list_destructors(xmlFreeDoc, NULL, "domxml document"); + le_domxmldocp = zend_register_list_destructors_ex(xmlFreeDoc, NULL, "domxml document", module_number); /* Freeing the document contains freeing the complete tree. Therefore nodes, attributes etc. may not be freed seperately. */ - le_domxmlnodep = register_list_destructors(_free_node, NULL, "domxml node"); - le_domxmlattrp = register_list_destructors(NULL, NULL, "domxml attribute"); + le_domxmlnodep = zend_register_list_destructors_ex(_free_node, NULL, "domxml node", module_number); + le_domxmlattrp = zend_register_list_destructors_ex(NULL, NULL, "domxml attribute", module_number); /* le_domxmlnsp = register_list_destructors(NULL, NULL); */ INIT_CLASS_ENTRY(domxmldoc_class_entry, "DomDocument", php_domxmldoc_class_functions); Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.34 php4/ext/fdf/fdf.c:1.35 --- php4/ext/fdf/fdf.c:1.34 Fri Oct 20 11:24:59 2000 +++ php4/ext/fdf/fdf.c Wed Oct 25 10:43:50 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.34 2000/10/20 18:24:59 andrei Exp $ */ +/* $Id: fdf.c,v 1.35 2000/10/25 17:43:50 andrei Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -118,7 +118,7 @@ PHP_MINIT_FUNCTION(fdf) { FDFErc err; - FDF_GLOBAL(le_fdf) = register_list_destructors(phpi_FDFClose, NULL, "fdf"); + FDF_GLOBAL(le_fdf) = zend_register_list_destructors_ex(phpi_FDFClose, NULL, "fdf", module_number); /* add handler for Acrobat FDF form post requests */ sapi_add_post_entry("application/vnd.fdf", php_default_post_reader, fdf_post_handler); Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.29 php4/ext/ftp/php_ftp.c:1.30 --- php4/ext/ftp/php_ftp.c:1.29 Fri Oct 20 11:25:00 2000 +++ php4/ext/ftp/php_ftp.c Wed Oct 25 10:43:50 2000 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.29 2000/10/20 18:25:00 andrei Exp $ */ +/* $Id: php_ftp.c,v 1.30 2000/10/25 17:43:50 andrei Exp $ */ #include "php.h" @@ -92,7 +92,7 @@ PHP_MINIT_FUNCTION(ftp) { - le_ftpbuf = register_list_destructors(ftp_destructor_ftpbuf, NULL, "ftp"); + le_ftpbuf = zend_register_list_destructors_ex(ftp_destructor_ftpbuf, NULL, "ftp", module_number); REGISTER_MAIN_LONG_CONSTANT("FTP_ASCII", FTPTYPE_ASCII, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("FTP_BINARY", FTPTYPE_IMAGE, Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.92 php4/ext/gd/gd.c:1.93 --- php4/ext/gd/gd.c:1.92 Wed Oct 25 10:35:29 2000 +++ php4/ext/gd/gd.c Wed Oct 25 10:43:50 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.92 2000/10/25 17:35:29 sniper Exp $ */ +/* $Id: gd.c,v 1.93 2000/10/25 17:43:50 andrei Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -225,14 +225,14 @@ return FAILURE; } #endif - GDG(le_gd) = register_list_destructors(php_free_gd_image, NULL, "gd"); - GDG(le_gd_font) = register_list_destructors(php_free_gd_font, NULL, "gd font"); + GDG(le_gd) = zend_register_list_destructors_ex(php_free_gd_image, NULL, "gd", module_number); + GDG(le_gd_font) = zend_register_list_destructors_ex(php_free_gd_font, NULL, "gd font", module_number); #if HAVE_LIBT1 T1_SetBitmapPad(8); T1_InitLib(NO_LOGFILE|IGNORE_CONFIGFILE|IGNORE_FONTDATABASE); T1_SetLogLevel(T1LOG_DEBUG); - GDG(le_ps_font) = register_list_destructors(php_free_ps_font, NULL, "gd PS font"); - GDG(le_ps_enc) = register_list_destructors(php_free_ps_enc, NULL, "gd PS encoding"); + GDG(le_ps_font) = zend_register_list_destructors_ex(php_free_ps_font, NULL, "gd PS font", module_number); + GDG(le_ps_enc) = zend_register_list_destructors_ex(php_free_ps_enc, NULL, "gd PS encoding", module_number); #endif REGISTER_LONG_CONSTANT("IMG_GIF", 1, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IMG_JPG", 2, CONST_CS | CONST_PERSISTENT); Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.64 php4/ext/hyperwave/hw.c:1.65 --- php4/ext/hyperwave/hw.c:1.64 Fri Oct 20 11:25:00 2000 +++ php4/ext/hyperwave/hw.c Wed Oct 25 10:43:51 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.64 2000/10/20 18:25:00 andrei Exp $ */ +/* $Id: hw.c,v 1.65 2000/10/25 17:43:51 andrei Exp $ */ #include <stdlib.h> #include <errno.h> @@ -194,9 +194,9 @@ ZEND_INIT_MODULE_GLOBALS(hw, php_hw_init_globals, NULL); REGISTER_INI_ENTRIES(); - HwSG(le_socketp) = register_list_destructors(_close_hw_link,NULL, "hyperwave link"); - HwSG(le_psocketp) = register_list_destructors(NULL,_close_hw_plink, "hyperwave link persistent"); - HwSG(le_document) = register_list_destructors(_free_hw_document,NULL, "hyperwave document"); + HwSG(le_socketp) = zend_register_list_destructors_ex(_close_hw_link, NULL, "hyperwave link", module_number); + HwSG(le_psocketp) = zend_register_list_destructors_ex(NULL, _close_hw_plink, "hyperwave link persistent", module_number); + HwSG(le_document) = zend_register_list_destructors_ex(_free_hw_document, NULL, "hyperwave document", module_number); hw_module_entry.type = type; REGISTER_LONG_CONSTANT("HW_ATTR_LANG", HW_ATTR_LANG, CONST_CS | CONST_PERSISTENT); Index: php4/ext/icap/php_icap.c diff -u php4/ext/icap/php_icap.c:1.20 php4/ext/icap/php_icap.c:1.21 --- php4/ext/icap/php_icap.c:1.20 Fri Oct 20 11:25:01 2000 +++ php4/ext/icap/php_icap.c Wed Oct 25 10:43:51 2000 @@ -137,7 +137,7 @@ PHP_MINIT_FUNCTION(icap) { - le_icap = register_list_destructors(cal_close_it,NULL,"icap"); + le_icap = zend_register_list_destructors_ex(cal_close_it, NULL, "icap", module_number); return SUCCESS; } Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.49 php4/ext/imap/php_imap.c:1.50 --- php4/ext/imap/php_imap.c:1.49 Fri Oct 20 11:25:03 2000 +++ php4/ext/imap/php_imap.c Wed Oct 25 10:43:52 2000 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.49 2000/10/20 18:25:03 andrei Exp $ */ +/* $Id: php_imap.c,v 1.50 2000/10/25 17:43:52 andrei Exp $ */ #define IMAP41 @@ -592,11 +592,11 @@ ENCOTHER unknown */ - le_imap = register_list_destructors(mail_close_it,NULL,"imap"); + le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); #ifdef OP_RELOGIN /* AJS: destructors for persistent connections */ - le_pimap = register_list_destructors(mail_userlogout_it, NULL, "imap persistent"); - le_pimapchain = register_list_destructors(NULL, mail_nuke_chain, "imap chain persistent"); + le_pimap = zend_register_list_destructors_ex(mail_userlogout_it, NULL, "imap persistent", module_number); + le_pimapchain = zend_register_list_destructors_ex(NULL, mail_nuke_chain, "imap chain persistent", module_number); #endif return SUCCESS; } Index: php4/ext/ingres_ii/ii.c diff -u php4/ext/ingres_ii/ii.c:1.11 php4/ext/ingres_ii/ii.c:1.12 --- php4/ext/ingres_ii/ii.c:1.11 Fri Oct 20 11:25:03 2000 +++ php4/ext/ingres_ii/ii.c Wed Oct 25 10:43:52 2000 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.11 2000/10/20 18:25:03 andrei Exp $ */ +/* $Id: ii.c,v 1.12 2000/10/25 17:43:52 andrei Exp $ */ #include "php.h" #include "php_globals.h" @@ -256,8 +256,8 @@ REGISTER_INI_ENTRIES(); - le_ii_link = register_list_destructors(php_close_ii_link,NULL,"ingres"); - le_ii_plink = register_list_destructors(_clean_ii_plink,php_close_ii_plink,"ingres persistent"); + le_ii_link = zend_register_list_destructors_ex(php_close_ii_link, NULL, "ingres", module_number); + le_ii_plink = zend_register_list_destructors_ex(_clean_ii_plink, php_close_ii_plink, "ingres persistent", module_number); IIG(num_persistent) = 0; Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.47 php4/ext/interbase/interbase.c:1.48 --- php4/ext/interbase/interbase.c:1.47 Sat Oct 21 10:38:08 2000 +++ php4/ext/interbase/interbase.c Wed Oct 25 10:43:52 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.47 2000/10/21 17:38:08 dbeu Exp $ */ +/* $Id: interbase.c,v 1.48 2000/10/25 17:43:52 andrei Exp $ */ /* TODO: Arrays, roles? @@ -509,12 +509,12 @@ REGISTER_INI_ENTRIES(); - le_result = register_list_destructors(_php_ibase_free_result, NULL, "interbase result"); - le_query = register_list_destructors(php_ibase_free_query_rsrc, NULL, "interbase query"); - le_blob = register_list_destructors(_php_ibase_free_blob, NULL, "interbase blob"); - le_link = register_list_destructors(_php_ibase_close_link, NULL, "interbase link"); - le_plink = register_list_destructors(php_ibase_commit_link_rsrc, _php_ibase_close_plink, "interbase link persistent"); - le_trans = register_list_destructors(_php_ibase_free_trans, NULL, "interbase transaction"); + le_result = zend_register_list_destructors_ex(_php_ibase_free_result, NULL, "interbase result", module_number); + le_query = zend_register_list_destructors_ex(php_ibase_free_query_rsrc, NULL, "interbase query", module_number); + le_blob = zend_register_list_destructors_ex(_php_ibase_free_blob, NULL, "interbase blob", module_number); + le_link = zend_register_list_destructors_ex(_php_ibase_close_link, NULL, "interbase link", module_number); + le_plink = zend_register_list_destructors_ex(php_ibase_commit_link_rsrc, _php_ibase_close_plink, "interbase link persistent", module_number); + le_trans = zend_register_list_destructors_ex(_php_ibase_free_trans, NULL, "interbase transaction", module_number); REGISTER_LONG_CONSTANT("IBASE_DEFAULT", PHP_IBASE_DEFAULT, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IBASE_TEXT", PHP_IBASE_TEXT, CONST_PERSISTENT); @@ -596,7 +596,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.47 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.48 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.38 php4/ext/java/java.c:1.39 --- php4/ext/java/java.c:1.38 Fri Oct 20 11:25:04 2000 +++ php4/ext/java/java.c Wed Oct 25 10:43:56 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.38 2000/10/20 18:25:04 andrei Exp $ */ +/* $Id: java.c,v 1.39 2000/10/25 17:43:56 andrei Exp $ */ /* * This module implements Zend OO syntax overloading support for Java @@ -613,7 +613,7 @@ zend_register_internal_class(&java_class_entry); - le_jobject = register_list_destructors(_php_java_destructor,NULL,"java"); + le_jobject = zend_register_list_destructors_ex(_php_java_destructor, NULL, "java", module_number); REGISTER_INI_ENTRIES(); Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.68 php4/ext/ldap/ldap.c:1.69 --- php4/ext/ldap/ldap.c:1.68 Sun Oct 22 04:25:47 2000 +++ php4/ext/ldap/ldap.c Wed Oct 25 10:43:56 2000 @@ -23,7 +23,7 @@ */ -/* $Id: ldap.c,v 1.68 2000/10/22 11:25:47 venaas Exp $ */ +/* $Id: ldap.c,v 1.69 2000/10/25 17:43:56 andrei Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -181,8 +181,8 @@ REGISTER_MAIN_LONG_CONSTANT("GSLC_SSL_TWOWAY_AUTH", GSLC_SSL_TWOWAY_AUTH, CONST_PERSISTENT | CONST_CS); #endif - le_result = register_list_destructors(_free_ldap_result, NULL, "ldap result"); - le_link = register_list_destructors(_close_ldap_link, NULL, "ldap link"); + le_result = zend_register_list_destructors_ex(_free_ldap_result, NULL, "ldap result", module_number); + le_link = zend_register_list_destructors_ex(_close_ldap_link, NULL, "ldap link", module_number); ldap_module_entry.type = type; @@ -224,7 +224,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled" ); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.68 2000/10/22 11:25:47 venaas Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.69 2000/10/25 17:43:56 andrei Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #ifdef LDAP_API_VERSION snprintf(ldapapiversion, 31, "%ld", LDAP_API_VERSION); Index: php4/ext/mcal/php_mcal.c diff -u php4/ext/mcal/php_mcal.c:1.36 php4/ext/mcal/php_mcal.c:1.37 --- php4/ext/mcal/php_mcal.c:1.36 Fri Oct 20 11:25:04 2000 +++ php4/ext/mcal/php_mcal.c Wed Oct 25 10:43:56 2000 @@ -152,7 +152,7 @@ PHP_MINIT_FUNCTION(mcal) { - le_mcal = register_list_destructors(cal_close_it,NULL,"mcal"); + le_mcal = zend_register_list_destructors_ex(cal_close_it, NULL, "mcal", module_number); REGISTER_MAIN_LONG_CONSTANT("MCAL_SUNDAY",SUNDAY, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("MCAL_MONDAY",MONDAY, CONST_PERSISTENT | CONST_CS); Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.23 php4/ext/msql/php_msql.c:1.24 --- php4/ext/msql/php_msql.c:1.23 Fri Oct 20 11:25:05 2000 +++ php4/ext/msql/php_msql.c Wed Oct 25 10:43:57 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.23 2000/10/20 18:25:05 andrei Exp $ */ +/* $Id: php_msql.c,v 1.24 2000/10/25 17:43:57 andrei Exp $ */ #include "php.h" #include "php_msql.h" @@ -162,9 +162,9 @@ msql_globals.max_links=-1; } msql_globals.num_persistent=0; - msql_globals.le_query = register_list_destructors(_delete_query,NULL,"msql query"); - msql_globals.le_link = register_list_destructors(_close_msql_link,NULL,"msql link"); - msql_globals.le_plink = register_list_destructors(NULL,_close_msql_plink, "msql link persistent"); + msql_globals.le_query = zend_register_list_destructors_ex(_delete_query, NULL, "msql query", module_number); + msql_globals.le_link = zend_register_list_destructors_ex(_close_msql_link, NULL, "msql link", module_number); + msql_globals.le_plink = zend_register_list_destructors_ex(NULL, _close_msql_plink, "msql link persistent", module_number); msql_module_entry.type = type; Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.30 php4/ext/mssql/php_mssql.c:1.31 --- php4/ext/mssql/php_mssql.c:1.30 Fri Oct 20 13:58:57 2000 +++ php4/ext/mssql/php_mssql.c Wed Oct 25 10:43:57 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.30 2000/10/20 20:58:57 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.31 2000/10/25 17:43:57 andrei Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -220,9 +220,9 @@ #endif REGISTER_INI_ENTRIES(); - le_result = register_list_destructors(_free_mssql_result, NULL, "mssql result"); - le_link = register_list_destructors(_close_mssql_link, NULL, "mssql link"); - le_plink = register_list_destructors(NULL, _close_mssql_plink, "mssql link persistent"); + le_result = zend_register_list_destructors_ex(_free_mssql_result, NULL, "mssql result", module_number); + le_link = zend_register_list_destructors_ex(_close_mssql_link, NULL, "mssql link", module_number); + le_plink = zend_register_list_destructors_ex(NULL, _close_mssql_plink, "mssql link persistent", module_number); mssql_module_entry.type = type; if (dbinit()==FAIL) { Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.55 php4/ext/mysql/php_mysql.c:1.56 --- php4/ext/mysql/php_mysql.c:1.55 Fri Oct 20 11:25:05 2000 +++ php4/ext/mysql/php_mysql.c Wed Oct 25 10:43:57 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.55 2000/10/20 18:25:05 andrei Exp $ */ +/* $Id: php_mysql.c,v 1.56 2000/10/25 17:43:57 andrei Exp $ */ /* TODO: @@ -261,9 +261,9 @@ ZEND_INIT_MODULE_GLOBALS(mysql, php_mysql_init_globals, NULL); REGISTER_INI_ENTRIES(); - le_result = register_list_destructors(_free_mysql_result,NULL,"mysql result"); - le_link = register_list_destructors(_close_mysql_link,NULL, "mysql link"); - le_plink = register_list_destructors(NULL,_close_mysql_plink, "mysql link persistent"); + le_result = zend_register_list_destructors_ex(_free_mysql_result, NULL, "mysql result", module_number); + le_link = zend_register_list_destructors_ex(_close_mysql_link, NULL, "mysql link", module_number); + le_plink = zend_register_list_destructors_ex(NULL, _close_mysql_plink, "mysql link persistent", module_number); mysql_module_entry.type = type; REGISTER_LONG_CONSTANT("MYSQL_ASSOC", MYSQL_ASSOC, CONST_CS | CONST_PERSISTENT); Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.100 php4/ext/oci8/oci8.c:1.101 --- php4/ext/oci8/oci8.c:1.100 Sun Oct 22 12:33:59 2000 +++ php4/ext/oci8/oci8.c Wed Oct 25 10:43:57 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.100 2000/10/22 19:33:59 thies Exp $ */ +/* $Id: oci8.c,v 1.101 2000/10/25 17:43:57 andrei Exp $ */ /* TODO list: * @@ -362,11 +362,11 @@ php_oci_init_globals(OCILS_C); #endif - le_stmt = register_list_destructors(_oci_stmt_list_dtor, NULL, "oci8 statement"); - le_conn = register_list_destructors(php_oci_free_conn_list, NULL, "oci8 connection"); - le_desc = register_list_destructors(_oci_descriptor_list_dtor, NULL, "oci8 descriptor"); - le_server = register_list_destructors(_oci_server_list_dtor, NULL, "oci8 server"); - le_session = register_list_destructors(_oci_session_list_dtor, NULL, "oci8 session"); + le_stmt = zend_register_list_destructors_ex(_oci_stmt_list_dtor, NULL, "oci8 statement", module_number); + le_conn = zend_register_list_destructors_ex(php_oci_free_conn_list, NULL, "oci8 connection", module_number); + le_desc = zend_register_list_destructors_ex(_oci_descriptor_list_dtor, NULL, "oci8 descriptor", module_number); + le_server = zend_register_list_destructors_ex(_oci_server_list_dtor, NULL, "oci8 server", module_number); + le_session = zend_register_list_destructors_ex(_oci_session_list_dtor, NULL, "oci8 session", module_number); INIT_CLASS_ENTRY(oci_lob_class_entry, "OCI-Lob", php_oci_lob_class_functions); @@ -491,7 +491,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.100 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.101 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.62 php4/ext/odbc/php_odbc.c:1.63 --- php4/ext/odbc/php_odbc.c:1.62 Fri Oct 20 11:25:08 2000 +++ php4/ext/odbc/php_odbc.c Wed Oct 25 10:43:58 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.62 2000/10/20 18:25:08 andrei Exp $ */ +/* $Id: php_odbc.c,v 1.63 2000/10/25 17:43:58 andrei Exp $ */ #include "php.h" #include "php_globals.h" @@ -331,9 +331,9 @@ #endif REGISTER_INI_ENTRIES(); - le_result = register_list_destructors(_free_odbc_result, NULL, "odbc result"); - le_conn = register_list_destructors(_close_odbc_conn, NULL, "odbc link"); - le_pconn = register_list_destructors(NULL, _close_odbc_pconn, "odbc link persistent"); + le_result = zend_register_list_destructors_ex(_free_odbc_result, NULL, "odbc result", module_number); + le_conn = zend_register_list_destructors_ex(_close_odbc_conn, NULL, "odbc link", module_number); + le_pconn = zend_register_list_destructors_ex(NULL, _close_odbc_pconn, "odbc link persistent", module_number); odbc_module_entry.type = type; REGISTER_LONG_CONSTANT("ODBC_BINMODE_PASSTHRU", 0, CONST_CS | CONST_PERSISTENT); Index: php4/ext/odbc/velocis.c diff -u php4/ext/odbc/velocis.c:1.22 php4/ext/odbc/velocis.c:1.23 --- php4/ext/odbc/velocis.c:1.22 Fri Oct 20 11:25:09 2000 +++ php4/ext/odbc/velocis.c Wed Oct 25 10:43:58 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: velocis.c,v 1.22 2000/10/20 18:25:09 andrei Exp $ */ +/* $Id: velocis.c,v 1.23 2000/10/25 17:43:58 andrei Exp $ */ /* * TODO: @@ -104,8 +104,8 @@ php_velocis_module.max_links = -1; } php_velocis_module.num_links = 0; - php_velocis_module.le_link = register_list_destructors(_close_velocis_link,NULL,"velocis link"); - php_velocis_module.le_result = register_list_destructors(_free_velocis_result,NULL,"velocis result"); + php_velocis_module.le_link = zend_register_list_destructors_ex(_close_velocis_link, NULL, "velocis link", module_number); + php_velocis_module.le_result = zend_register_list_destructors_ex(_free_velocis_result, NULL, "velocis result", module_number); return SUCCESS; } Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.55 php4/ext/oracle/oracle.c:1.56 --- php4/ext/oracle/oracle.c:1.55 Fri Oct 20 11:25:09 2000 +++ php4/ext/oracle/oracle.c Wed Oct 25 10:43:58 2000 @@ -290,9 +290,9 @@ php_ora_init_globals(ORALS_C); #endif - le_cursor = register_list_destructors(php_close_ora_cursor, NULL, "oracle cursor"); - le_conn = register_list_destructors(_close_oraconn, NULL, "oracle link"); - le_pconn = register_list_destructors(NULL, _close_oraconn, "oracle link persistent"); + le_cursor = zend_register_list_destructors_ex(php_close_ora_cursor, NULL, "oracle cursor", module_number); + le_conn = zend_register_list_destructors_ex(_close_oraconn, NULL, "oracle link", module_number); + le_pconn = zend_register_list_destructors_ex(NULL, _close_oraconn, "oracle link persistent", module_number); REGISTER_LONG_CONSTANT("ORA_BIND_INOUT", 0, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ORA_BIND_IN", 1, CONST_CS | CONST_PERSISTENT); Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.56 php4/ext/pdf/pdf.c:1.57 --- php4/ext/pdf/pdf.c:1.56 Fri Oct 20 11:25:10 2000 +++ php4/ext/pdf/pdf.c Wed Oct 25 10:43:58 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.56 2000/10/20 18:25:10 andrei Exp $ */ +/* $Id: pdf.c,v 1.57 2000/10/25 17:43:58 andrei Exp $ */ /* pdflib 2.02 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -237,9 +237,9 @@ PHP_MINIT_FUNCTION(pdf) { - PDF_GLOBAL(le_pdf_image) = register_list_destructors(_free_pdf_image, NULL, "pdf image"); - PDF_GLOBAL(le_outline) = register_list_destructors(_free_outline, NULL, "pdf outline"); - PDF_GLOBAL(le_pdf) = register_list_destructors(_free_pdf_doc, NULL, "pdf document"); + PDF_GLOBAL(le_pdf_image) = zend_register_list_destructors_ex(_free_pdf_image, NULL, "pdf image", module_number); + PDF_GLOBAL(le_outline) = zend_register_list_destructors_ex(_free_outline, NULL, "pdf outline", module_number); + PDF_GLOBAL(le_pdf) = zend_register_list_destructors_ex(_free_pdf_doc, NULL, "pdf document", module_number); return SUCCESS; } Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.76 php4/ext/pgsql/pgsql.c:1.77 --- php4/ext/pgsql/pgsql.c:1.76 Fri Oct 20 11:25:10 2000 +++ php4/ext/pgsql/pgsql.c Wed Oct 25 10:43:59 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.76 2000/10/20 18:25:10 andrei Exp $ */ +/* $Id: pgsql.c,v 1.77 2000/10/25 17:43:59 andrei Exp $ */ #include <stdlib.h> @@ -179,12 +179,12 @@ REGISTER_INI_ENTRIES(); - le_link = register_list_destructors(_close_pgsql_link,NULL, "pgsql link"); - le_plink = register_list_destructors(NULL,_close_pgsql_plink, "pgsql link persistent"); + le_link = zend_register_list_destructors_ex(_close_pgsql_link, NULL, "pgsql link", module_number); + le_plink = zend_register_list_destructors_ex(NULL, _close_pgsql_plink, "pgsql link persistent", module_number); /* PGG(le_result = register_list_destructors(PQclear,NULL); */ - le_result = register_list_destructors(_free_result,NULL, "pgsql result"); - le_lofp = register_list_destructors(_free_ptr,NULL, "pgsql large object"); - le_string = register_list_destructors(_free_ptr,NULL, "pgsql string"); + le_result = zend_register_list_destructors_ex(_free_result, NULL, "pgsql result", module_number); + le_lofp = zend_register_list_destructors_ex(_free_ptr, NULL, "pgsql large object", module_number); + le_string = zend_register_list_destructors_ex(_free_ptr, NULL, "pgsql string", module_number); REGISTER_LONG_CONSTANT("PGSQL_ASSOC", PGSQL_ASSOC, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PGSQL_NUM", PGSQL_NUM, CONST_CS | CONST_PERSISTENT); Index: php4/ext/pspell/pspell.c diff -u php4/ext/pspell/pspell.c:1.11 php4/ext/pspell/pspell.c:1.12 --- php4/ext/pspell/pspell.c:1.11 Fri Oct 20 11:25:10 2000 +++ php4/ext/pspell/pspell.c Wed Oct 25 10:43:59 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.11 2000/10/20 18:25:10 andrei Exp $ */ +/* $Id: pspell.c,v 1.12 2000/10/25 17:43:59 andrei Exp $ */ #define IS_EXT_MODULE @@ -85,8 +85,8 @@ REGISTER_MAIN_LONG_CONSTANT("PSPELL_NORMAL", PSPELL_NORMAL, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PSPELL_BAD_SPELLERS", PSPELL_BAD_SPELLERS, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PSPELL_RUN_TOGETHER", PSPELL_RUN_TOGETHER, CONST_PERSISTENT | CONST_CS); - le_pspell = register_list_destructors(php_pspell_close,NULL,"pspell"); - le_pspell_config = register_list_destructors(php_pspell_close_config,NULL,"pspell config"); + le_pspell = zend_register_list_destructors_ex(php_pspell_close, NULL, "pspell", module_number); + le_pspell_config = zend_register_list_destructors_ex(php_pspell_close_config, NULL, "pspell config", module_number); return SUCCESS; } Index: php4/ext/sablot/sablot.c diff -u php4/ext/sablot/sablot.c:1.10 php4/ext/sablot/sablot.c:1.11 --- php4/ext/sablot/sablot.c:1.10 Fri Oct 20 11:25:11 2000 +++ php4/ext/sablot/sablot.c Wed Oct 25 10:43:59 2000 @@ -140,7 +140,7 @@ PHP_MINIT_FUNCTION(sablot) { SABLOTLS_FETCH(); - SABLOTG(le_sablot) = register_list_destructors(_php_sablot_free_processor, NULL, "sablotron"); + SABLOTG(le_sablot) = zend_register_list_destructors_ex(_php_sablot_free_processor, NULL, "sablotron", module_number); return SUCCESS; } Index: php4/ext/shmop/shmop.c diff -u php4/ext/shmop/shmop.c:1.6 php4/ext/shmop/shmop.c:1.7 --- php4/ext/shmop/shmop.c:1.6 Fri Oct 20 11:25:11 2000 +++ php4/ext/shmop/shmop.c Wed Oct 25 10:44:00 2000 @@ -69,7 +69,7 @@ PHP_MINIT_FUNCTION(shmop) { - shm_type = register_list_destructors(rsclean, NULL, "shmop"); + shm_type = zend_register_list_destructors_ex(rsclean, NULL, "shmop", module_number); return SUCCESS; } Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.19 php4/ext/sockets/sockets.c:1.20 --- php4/ext/sockets/sockets.c:1.19 Sun Oct 22 16:43:48 2000 +++ php4/ext/sockets/sockets.c Wed Oct 25 10:44:00 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.19 2000/10/22 23:43:48 chrisv Exp $ */ +/* $Id: sockets.c,v 1.20 2000/10/25 17:44:00 andrei Exp $ */ #include "php.h" @@ -200,8 +200,8 @@ PHP_MINIT_FUNCTION(sockets) { SOCKETSLS_FETCH(); - SOCKETSG(le_destroy) = register_list_destructors(destroy_fd_sets, NULL, "sockets file descriptor set"); - SOCKETSG(le_iov) = register_list_destructors(destroy_iovec, NULL, "sockets i/o vector"); + SOCKETSG(le_destroy) = zend_register_list_destructors_ex(destroy_fd_sets, NULL, "sockets file descriptor set", module_number); + SOCKETSG(le_iov) = zend_register_list_destructors_ex(destroy_iovec, NULL, "sockets i/o vector", module_number); REGISTER_INI_ENTRIES(); Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.46 php4/ext/standard/dir.c:1.47 --- php4/ext/standard/dir.c:1.46 Fri Oct 20 11:25:12 2000 +++ php4/ext/standard/dir.c Wed Oct 25 10:44:00 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.46 2000/10/20 18:25:12 andrei Exp $ */ +/* $Id: dir.c,v 1.47 2000/10/25 17:44:00 andrei Exp $ */ /* {{{ includes/startup/misc */ @@ -126,7 +126,7 @@ { zend_class_entry dir_class_entry; - le_dirp = register_list_destructors(_dir_dtor,NULL, "dir"); + le_dirp = zend_register_list_destructors_ex(_dir_dtor, NULL, "dir", module_number); INIT_CLASS_ENTRY(dir_class_entry, "Directory", php_dir_class_functions); dir_class_entry_ptr = zend_register_internal_class(&dir_class_entry); Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.117 php4/ext/standard/file.c:1.118 --- php4/ext/standard/file.c:1.117 Fri Oct 20 11:25:12 2000 +++ php4/ext/standard/file.c Wed Oct 25 10:44:00 2000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.117 2000/10/20 18:25:12 andrei Exp $ */ +/* $Id: file.c,v 1.118 2000/10/25 17:44:00 andrei Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -168,9 +168,9 @@ PHP_MINIT_FUNCTION(file) { - le_fopen = register_list_destructors(_file_fopen_dtor, NULL, "file"); - le_popen = register_list_destructors(_file_popen_dtor, NULL, "pipe"); - le_socket = register_list_destructors(_file_socket_dtor, NULL, "socket"); + le_fopen = zend_register_list_destructors_ex(_file_fopen_dtor, NULL, "file", module_number); + le_popen = zend_register_list_destructors_ex(_file_popen_dtor, NULL, "pipe", module_number); + le_socket = zend_register_list_destructors_ex(_file_socket_dtor, NULL, "socket", module_number); #ifdef ZTS file_globals_id = ts_allocate_id(sizeof(php_file_globals), (ts_allocate_ctor) php_file_init_globals, NULL); Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.7 php4/ext/sybase/php_sybase_db.c:1.8 --- php4/ext/sybase/php_sybase_db.c:1.7 Fri Oct 20 11:25:12 2000 +++ php4/ext/sybase/php_sybase_db.c Wed Oct 25 10:44:01 2000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.7 2000/10/20 18:25:12 andrei Exp $ */ +/* $Id: php_sybase_db.c,v 1.8 2000/10/25 17:44:01 andrei Exp $ */ #include "php.h" @@ -223,9 +223,9 @@ } php_sybase_module.num_persistent=0; - php_sybase_module.le_link = register_list_destructors(_close_sybase_link,NULL, "sybase-db link"); - php_sybase_module.le_plink = register_list_destructors(NULL,_close_sybase_plink, "sybase-db link persistent"); - php_sybase_module.le_result = register_list_destructors(_free_sybase_result,NULL, "sybase-db result"); + php_sybase_module.le_link = zend_register_list_destructors_ex(_close_sybase_link, NULL, "sybase-db link", module_number); + php_sybase_module.le_plink = zend_register_list_destructors_ex(NULL, _close_sybase_plink, "sybase-db link persistent", module_number); + php_sybase_module.le_result = zend_register_list_destructors_ex(_free_sybase_result, NULL, "sybase-db result", module_number); return SUCCESS; } Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.36 php4/ext/sybase_ct/php_sybase_ct.c:1.37 --- php4/ext/sybase_ct/php_sybase_ct.c:1.36 Fri Oct 20 11:25:13 2000 +++ php4/ext/sybase_ct/php_sybase_ct.c Wed Oct 25 10:44:01 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.36 2000/10/20 18:25:13 andrei Exp $ */ +/* $Id: php_sybase_ct.c,v 1.37 2000/10/25 17:44:01 andrei Exp $ */ #include "php.h" @@ -322,9 +322,9 @@ REGISTER_INI_ENTRIES(); - le_link = register_list_destructors(_close_sybase_link,NULL, "sybase-ct link"); - le_plink = register_list_destructors(NULL,_close_sybase_plink, "sybase-ct link persistent"); - le_result = register_list_destructors(php_free_sybase_result,NULL, "sybase-ct result"); + le_link = zend_register_list_destructors_ex(_close_sybase_link, NULL, "sybase-ct link", module_number); + le_plink = zend_register_list_destructors_ex(NULL, _close_sybase_plink, "sybase-ct link persistent", module_number); + le_result = zend_register_list_destructors_ex(php_free_sybase_result, NULL, "sybase-ct result", module_number); return SUCCESS; } Index: php4/ext/sysvsem/sysvsem.c diff -u php4/ext/sysvsem/sysvsem.c:1.25 php4/ext/sysvsem/sysvsem.c:1.26 --- php4/ext/sysvsem/sysvsem.c:1.25 Fri Oct 20 11:25:13 2000 +++ php4/ext/sysvsem/sysvsem.c Wed Oct 25 10:44:01 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.25 2000/10/20 18:25:13 andrei Exp $ */ +/* $Id: sysvsem.c,v 1.26 2000/10/25 17:44:01 andrei Exp $ */ /* This has been built and tested on Solaris 2.6 and Linux 2.1.122. * It may not compile or execute correctly on other systems. @@ -117,7 +117,7 @@ PHP_MINIT_FUNCTION(sysvsem) { - php_sysvsem_module.le_sem = register_list_destructors(release_sysvsem_sem, NULL, "sysvsem"); + php_sysvsem_module.le_sem = zend_register_list_destructors_ex(release_sysvsem_sem, NULL, "sysvsem", module_number); return SUCCESS; } Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.31 php4/ext/sysvshm/sysvshm.c:1.32 --- php4/ext/sysvshm/sysvshm.c:1.31 Fri Oct 20 11:25:13 2000 +++ php4/ext/sysvshm/sysvshm.c Wed Oct 25 10:44:01 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.31 2000/10/20 18:25:13 andrei Exp $ */ +/* $Id: sysvshm.c,v 1.32 2000/10/25 17:44:01 andrei Exp $ */ /* This has been built and tested on Solaris 2.6. * It may not compile or execute correctly on other systems. @@ -67,7 +67,7 @@ PHP_MINIT_FUNCTION(sysvshm) { - php_sysvshm.le_shm = register_list_destructors(php_release_sysvshm, NULL, "sysvshm"); + php_sysvshm.le_shm = zend_register_list_destructors_ex(php_release_sysvshm, NULL, "sysvshm", module_number); if (cfg_get_long("sysvshm.init_mem", &php_sysvshm.init_mem)==FAILURE) { php_sysvshm.init_mem=10000; Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.57 php4/ext/wddx/wddx.c:1.58 --- php4/ext/wddx/wddx.c:1.57 Fri Oct 20 11:25:14 2000 +++ php4/ext/wddx/wddx.c Wed Oct 25 10:44:02 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.57 2000/10/20 18:25:14 andrei Exp $ */ +/* $Id: wddx.c,v 1.58 2000/10/25 17:44:02 andrei Exp $ */ #include "php.h" #include "php_wddx.h" @@ -242,7 +242,7 @@ /* {{{ php_minit_wddx */ PHP_MINIT_FUNCTION(wddx) { - le_wddx = register_list_destructors(php_free_wddx_packet, NULL, "wddx"); + le_wddx = zend_register_list_destructors_ex(php_free_wddx_packet, NULL, "wddx", module_number); return SUCCESS; } Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.62 php4/ext/xml/xml.c:1.63 --- php4/ext/xml/xml.c:1.62 Fri Oct 20 11:25:15 2000 +++ php4/ext/xml/xml.c Wed Oct 25 10:44:02 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.62 2000/10/20 18:25:15 andrei Exp $ */ +/* $Id: xml.c,v 1.63 2000/10/25 17:44:02 andrei Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -159,7 +159,7 @@ PHP_MINIT_FUNCTION(xml) { - le_xml_parser = register_list_destructors(xml_parser_dtor, NULL, "xml"); + le_xml_parser = zend_register_list_destructors_ex(xml_parser_dtor, NULL, "xml", module_number); #ifdef ZTS xml_globals_id = ts_allocate_id(sizeof(php_xml_globals), (ts_allocate_ctor) php_xml_init_globals, NULL); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.61 php4/ext/zlib/zlib.c:1.62 --- php4/ext/zlib/zlib.c:1.61 Mon Oct 23 07:04:54 2000 +++ php4/ext/zlib/zlib.c Wed Oct 25 10:44:02 2000 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.61 2000/10/23 14:04:54 sas Exp $ */ +/* $Id: zlib.c,v 1.62 2000/10/25 17:44:02 andrei Exp $ */ #define IS_EXT_MODULE #ifndef PHP_WIN32 @@ -147,7 +147,7 @@ #else ZLIBG(gzgetss_state)=0; #endif - le_zp = register_list_destructors(phpi_destructor_gzclose,NULL,"zlib"); + le_zp = zend_register_list_destructors_ex(phpi_destructor_gzclose, NULL, "zlib", module_number); #if HAVE_FOPENCOOKIE
Index: php4/ext/aspell/aspell.c diff -u php4/ext/aspell/aspell.c:1.23 php4/ext/aspell/aspell.c:1.24 --- php4/ext/aspell/aspell.c:1.23 Fri Oct 20 11:24:55 2000 +++ php4/ext/aspell/aspell.c Wed Oct 25 10:43:48 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: aspell.c,v 1.23 2000/10/20 18:24:55 andrei Exp $ */ +/* $Id: aspell.c,v 1.24 2000/10/25 17:43:48 andrei Exp $ */ #include "php.h" @@ -61,7 +61,7 @@ PHP_MINIT_FUNCTION(aspell) { - le_aspell = register_list_destructors(php_aspell_close,NULL,"aspell"); + le_aspell = zend_register_list_destructors_ex(php_aspell_close, NULL, "aspell", module_number); return SUCCESS; } Index: php4/ext/bz2/bz2.c diff -u php4/ext/bz2/bz2.c:1.4 php4/ext/bz2/bz2.c:1.5 --- php4/ext/bz2/bz2.c:1.4 Mon Oct 23 06:37:25 2000 +++ php4/ext/bz2/bz2.c Wed Oct 25 10:43:48 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: bz2.c,v 1.4 2000/10/23 13:37:25 andrei Exp $ */ +/* $Id: bz2.c,v 1.5 2000/10/25 17:43:48 andrei Exp $ */ #include "php.h" @@ -70,7 +70,7 @@ PHP_MINIT_FUNCTION(bz2) { - le_bz2 = register_list_destructors(_php_bz2_close_handle, NULL,"bzip2"); + le_bz2 = zend_register_list_destructors_ex(_php_bz2_close_handle, NULL, "bzip2", module_number); return SUCCESS; } Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.40 php4/ext/com/COM.c:1.41 --- php4/ext/com/COM.c:1.40 Fri Oct 20 11:24:57 2000 +++ php4/ext/com/COM.c Wed Oct 25 10:43:48 2000 @@ -227,7 +227,7 @@ PHP_MINIT_FUNCTION(COM) { CoInitialize(NULL); - le_idispatch = register_list_destructors(php_idispatch_destructor, NULL,"COM"); + le_idispatch = zend_register_list_destructors_ex(php_idispatch_destructor, NULL, "COM", module_number); php_register_COM_class(); REGISTER_INI_ENTRIES(); return SUCCESS; Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.20 php4/ext/cpdf/cpdf.c:1.21 --- php4/ext/cpdf/cpdf.c:1.20 Fri Oct 20 11:24:58 2000 +++ php4/ext/cpdf/cpdf.c Wed Oct 25 10:43:49 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.20 2000/10/20 18:24:58 andrei Exp $ */ +/* $Id: cpdf.c,v 1.21 2000/10/25 17:43:49 andrei Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -174,8 +174,8 @@ PHP_MINIT_FUNCTION(cpdf) { - CPDF_GLOBAL(le_outline) = register_list_destructors(_free_outline, NULL,"cpdf outline"); - CPDF_GLOBAL(le_cpdf) = register_list_destructors(_free_doc, NULL,"cpdf"); + CPDF_GLOBAL(le_outline) = zend_register_list_destructors_ex(_free_outline, NULL, "cpdf outline", module_number); + CPDF_GLOBAL(le_cpdf) = zend_register_list_destructors_ex(_free_doc, NULL, "cpdf", module_number); return SUCCESS; } Index: php4/ext/curl/curl.c diff -u php4/ext/curl/curl.c:1.19 php4/ext/curl/curl.c:1.20 --- php4/ext/curl/curl.c:1.19 Sun Oct 22 10:29:33 2000 +++ php4/ext/curl/curl.c Wed Oct 25 10:43:49 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: curl.c,v 1.19 2000/10/22 17:29:33 sniper Exp $ */ +/* $Id: curl.c,v 1.20 2000/10/25 17:43:49 andrei Exp $ */ #include "php.h" @@ -134,7 +134,7 @@ PHP_MINIT_FUNCTION(curl) { - le_curl = register_list_destructors(_php_curl_close, NULL, "curl"); + le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number); /* Constants for curl_setopt() */ REGISTER_LONG_CONSTANT("CURLOPT_PORT", CURLOPT_PORT, CONST_CS | CONST_PERSISTENT); Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.44 php4/ext/db/db.c:1.45 --- php4/ext/db/db.c:1.44 Fri Oct 20 11:24:58 2000 +++ php4/ext/db/db.c Wed Oct 25 10:43:49 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.44 2000/10/20 18:24:58 andrei Exp $ */ +/* $Id: db.c,v 1.45 2000/10/25 17:43:49 andrei Exp $ */ #define IS_EXT_MODULE #if 1 @@ -1122,7 +1122,7 @@ } #endif - le_db = register_list_destructors(php_dbm_close,NULL,"dbm"); + le_db = zend_register_list_destructors_ex(php_dbm_close, NULL, "dbm", module_number); return SUCCESS; } Index: php4/ext/dba/dba.c diff -u php4/ext/dba/dba.c:1.23 php4/ext/dba/dba.c:1.24 --- php4/ext/dba/dba.c:1.23 Sat Oct 21 05:03:09 2000 +++ php4/ext/dba/dba.c Wed Oct 25 10:43:49 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dba.c,v 1.23 2000/10/21 12:03:09 rasmus Exp $ */ +/* $Id: dba.c,v 1.24 2000/10/25 17:43:49 andrei Exp $ */ #include "php.h" @@ -190,8 +190,8 @@ static PHP_MINIT_FUNCTION(dba) { zend_hash_init(&ht_keys, 0, NULL, NULL, 1); - GLOBAL(le_db) = register_list_destructors(dba_close, NULL,"dba"); - GLOBAL(le_pdb) = register_list_destructors(NULL, dba_close,"dba persistent"); + GLOBAL(le_db) = zend_register_list_destructors_ex(dba_close, NULL, "dba", module_number); + GLOBAL(le_pdb) = zend_register_list_destructors_ex(NULL, dba_close, "dba persistent", module_number); return SUCCESS; } @@ -207,7 +207,7 @@ dba_handler *hptr; php_info_print_box_start(0); - PUTS("V1 ($Id: dba.c,v 1.23 2000/10/21 12:03:09 rasmus Exp $)"); + PUTS("V1 ($Id: dba.c,v 1.24 2000/10/25 17:43:49 andrei Exp $)"); for(hptr = handler; hptr->name; hptr++) { PUTS(" "); PUTS(hptr->name); Index: php4/ext/dbase/dbase.c diff -u php4/ext/dbase/dbase.c:1.32 php4/ext/dbase/dbase.c:1.33 --- php4/ext/dbase/dbase.c:1.32 Fri Oct 20 11:24:59 2000 +++ php4/ext/dbase/dbase.c Wed Oct 25 10:43:50 2000 @@ -82,7 +82,7 @@ TlsSetValue(DbaseTls, (void *) dbase_globals); #endif DBase_GLOBAL(le_dbhead) = - register_list_destructors(_close_dbase,NULL,"dbase"); + zend_register_list_destructors_ex(_close_dbase, NULL, "dbase", module_number); return SUCCESS; } Index: php4/ext/domxml/php_domxml.c diff -u php4/ext/domxml/php_domxml.c:1.11 php4/ext/domxml/php_domxml.c:1.12 --- php4/ext/domxml/php_domxml.c:1.11 Fri Oct 20 11:24:59 2000 +++ php4/ext/domxml/php_domxml.c Wed Oct 25 10:43:50 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_domxml.c,v 1.11 2000/10/20 18:24:59 andrei Exp $ */ +/* $Id: php_domxml.c,v 1.12 2000/10/25 17:43:50 andrei Exp $ */ #include "php.h" @@ -133,12 +133,12 @@ domxmltestnode_class_startup(); #endif - le_domxmldocp = register_list_destructors(xmlFreeDoc, NULL, "domxml document"); + le_domxmldocp = zend_register_list_destructors_ex(xmlFreeDoc, NULL, "domxml document", module_number); /* Freeing the document contains freeing the complete tree. Therefore nodes, attributes etc. may not be freed seperately. */ - le_domxmlnodep = register_list_destructors(_free_node, NULL, "domxml node"); - le_domxmlattrp = register_list_destructors(NULL, NULL, "domxml attribute"); + le_domxmlnodep = zend_register_list_destructors_ex(_free_node, NULL, "domxml node", module_number); + le_domxmlattrp = zend_register_list_destructors_ex(NULL, NULL, "domxml attribute", module_number); /* le_domxmlnsp = register_list_destructors(NULL, NULL); */ INIT_CLASS_ENTRY(domxmldoc_class_entry, "DomDocument", php_domxmldoc_class_functions); Index: php4/ext/fdf/fdf.c diff -u php4/ext/fdf/fdf.c:1.34 php4/ext/fdf/fdf.c:1.35 --- php4/ext/fdf/fdf.c:1.34 Fri Oct 20 11:24:59 2000 +++ php4/ext/fdf/fdf.c Wed Oct 25 10:43:50 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fdf.c,v 1.34 2000/10/20 18:24:59 andrei Exp $ */ +/* $Id: fdf.c,v 1.35 2000/10/25 17:43:50 andrei Exp $ */ /* FdfTk lib 2.0 is a Complete C/C++ FDF Toolkit available from http://beta1.adobe.com/ada/acrosdk/forms.html. */ @@ -118,7 +118,7 @@ PHP_MINIT_FUNCTION(fdf) { FDFErc err; - FDF_GLOBAL(le_fdf) = register_list_destructors(phpi_FDFClose, NULL, "fdf"); + FDF_GLOBAL(le_fdf) = zend_register_list_destructors_ex(phpi_FDFClose, NULL, "fdf", module_number); /* add handler for Acrobat FDF form post requests */ sapi_add_post_entry("application/vnd.fdf", php_default_post_reader, fdf_post_handler); Index: php4/ext/ftp/php_ftp.c diff -u php4/ext/ftp/php_ftp.c:1.29 php4/ext/ftp/php_ftp.c:1.30 --- php4/ext/ftp/php_ftp.c:1.29 Fri Oct 20 11:25:00 2000 +++ php4/ext/ftp/php_ftp.c Wed Oct 25 10:43:50 2000 @@ -28,7 +28,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ftp.c,v 1.29 2000/10/20 18:25:00 andrei Exp $ */ +/* $Id: php_ftp.c,v 1.30 2000/10/25 17:43:50 andrei Exp $ */ #include "php.h" @@ -92,7 +92,7 @@ PHP_MINIT_FUNCTION(ftp) { - le_ftpbuf = register_list_destructors(ftp_destructor_ftpbuf, NULL, "ftp"); + le_ftpbuf = zend_register_list_destructors_ex(ftp_destructor_ftpbuf, NULL, "ftp", module_number); REGISTER_MAIN_LONG_CONSTANT("FTP_ASCII", FTPTYPE_ASCII, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("FTP_BINARY", FTPTYPE_IMAGE, Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.92 php4/ext/gd/gd.c:1.93 --- php4/ext/gd/gd.c:1.92 Wed Oct 25 10:35:29 2000 +++ php4/ext/gd/gd.c Wed Oct 25 10:43:50 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.92 2000/10/25 17:35:29 sniper Exp $ */ +/* $Id: gd.c,v 1.93 2000/10/25 17:43:50 andrei Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -225,14 +225,14 @@ return FAILURE; } #endif - GDG(le_gd) = register_list_destructors(php_free_gd_image, NULL, "gd"); - GDG(le_gd_font) = register_list_destructors(php_free_gd_font, NULL, "gd font"); + GDG(le_gd) = zend_register_list_destructors_ex(php_free_gd_image, NULL, "gd", module_number); + GDG(le_gd_font) = zend_register_list_destructors_ex(php_free_gd_font, NULL, "gd font", module_number); #if HAVE_LIBT1 T1_SetBitmapPad(8); T1_InitLib(NO_LOGFILE|IGNORE_CONFIGFILE|IGNORE_FONTDATABASE); T1_SetLogLevel(T1LOG_DEBUG); - GDG(le_ps_font) = register_list_destructors(php_free_ps_font, NULL, "gd PS font"); - GDG(le_ps_enc) = register_list_destructors(php_free_ps_enc, NULL, "gd PS encoding"); + GDG(le_ps_font) = zend_register_list_destructors_ex(php_free_ps_font, NULL, "gd PS font", module_number); + GDG(le_ps_enc) = zend_register_list_destructors_ex(php_free_ps_enc, NULL, "gd PS encoding", module_number); #endif REGISTER_LONG_CONSTANT("IMG_GIF", 1, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IMG_JPG", 2, CONST_CS | CONST_PERSISTENT); Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.64 php4/ext/hyperwave/hw.c:1.65 --- php4/ext/hyperwave/hw.c:1.64 Fri Oct 20 11:25:00 2000 +++ php4/ext/hyperwave/hw.c Wed Oct 25 10:43:51 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.64 2000/10/20 18:25:00 andrei Exp $ */ +/* $Id: hw.c,v 1.65 2000/10/25 17:43:51 andrei Exp $ */ #include <stdlib.h> #include <errno.h> @@ -194,9 +194,9 @@ ZEND_INIT_MODULE_GLOBALS(hw, php_hw_init_globals, NULL); REGISTER_INI_ENTRIES(); - HwSG(le_socketp) = register_list_destructors(_close_hw_link,NULL, "hyperwave link"); - HwSG(le_psocketp) = register_list_destructors(NULL,_close_hw_plink, "hyperwave link persistent"); - HwSG(le_document) = register_list_destructors(_free_hw_document,NULL, "hyperwave document"); + HwSG(le_socketp) = zend_register_list_destructors_ex(_close_hw_link, NULL, "hyperwave link", module_number); + HwSG(le_psocketp) = zend_register_list_destructors_ex(NULL, _close_hw_plink, "hyperwave link persistent", module_number); + HwSG(le_document) = zend_register_list_destructors_ex(_free_hw_document, NULL, "hyperwave document", module_number); hw_module_entry.type = type; REGISTER_LONG_CONSTANT("HW_ATTR_LANG", HW_ATTR_LANG, CONST_CS | CONST_PERSISTENT); Index: php4/ext/icap/php_icap.c diff -u php4/ext/icap/php_icap.c:1.20 php4/ext/icap/php_icap.c:1.21 --- php4/ext/icap/php_icap.c:1.20 Fri Oct 20 11:25:01 2000 +++ php4/ext/icap/php_icap.c Wed Oct 25 10:43:51 2000 @@ -137,7 +137,7 @@ PHP_MINIT_FUNCTION(icap) { - le_icap = register_list_destructors(cal_close_it,NULL,"icap"); + le_icap = zend_register_list_destructors_ex(cal_close_it, NULL, "icap", module_number); return SUCCESS; } Index: php4/ext/imap/php_imap.c diff -u php4/ext/imap/php_imap.c:1.49 php4/ext/imap/php_imap.c:1.50 --- php4/ext/imap/php_imap.c:1.49 Fri Oct 20 11:25:03 2000 +++ php4/ext/imap/php_imap.c Wed Oct 25 10:43:52 2000 @@ -25,7 +25,7 @@ | PHP 4.0 updates: Zeev Suraski <zeev@zend.com> | +----------------------------------------------------------------------+ */ -/* $Id: php_imap.c,v 1.49 2000/10/20 18:25:03 andrei Exp $ */ +/* $Id: php_imap.c,v 1.50 2000/10/25 17:43:52 andrei Exp $ */ #define IMAP41 @@ -592,11 +592,11 @@ ENCOTHER unknown */ - le_imap = register_list_destructors(mail_close_it,NULL,"imap"); + le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); #ifdef OP_RELOGIN /* AJS: destructors for persistent connections */ - le_pimap = register_list_destructors(mail_userlogout_it, NULL, "imap persistent"); - le_pimapchain = register_list_destructors(NULL, mail_nuke_chain, "imap chain persistent"); + le_pimap = zend_register_list_destructors_ex(mail_userlogout_it, NULL, "imap persistent", module_number); + le_pimapchain = zend_register_list_destructors_ex(NULL, mail_nuke_chain, "imap chain persistent", module_number); #endif return SUCCESS; } Index: php4/ext/ingres_ii/ii.c diff -u php4/ext/ingres_ii/ii.c:1.11 php4/ext/ingres_ii/ii.c:1.12 --- php4/ext/ingres_ii/ii.c:1.11 Fri Oct 20 11:25:03 2000 +++ php4/ext/ingres_ii/ii.c Wed Oct 25 10:43:52 2000 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: ii.c,v 1.11 2000/10/20 18:25:03 andrei Exp $ */ +/* $Id: ii.c,v 1.12 2000/10/25 17:43:52 andrei Exp $ */ #include "php.h" #include "php_globals.h" @@ -256,8 +256,8 @@ REGISTER_INI_ENTRIES(); - le_ii_link = register_list_destructors(php_close_ii_link,NULL,"ingres"); - le_ii_plink = register_list_destructors(_clean_ii_plink,php_close_ii_plink,"ingres persistent"); + le_ii_link = zend_register_list_destructors_ex(php_close_ii_link, NULL, "ingres", module_number); + le_ii_plink = zend_register_list_destructors_ex(_clean_ii_plink, php_close_ii_plink, "ingres persistent", module_number); IIG(num_persistent) = 0; Index: php4/ext/interbase/interbase.c diff -u php4/ext/interbase/interbase.c:1.47 php4/ext/interbase/interbase.c:1.48 --- php4/ext/interbase/interbase.c:1.47 Sat Oct 21 10:38:08 2000 +++ php4/ext/interbase/interbase.c Wed Oct 25 10:43:52 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interbase.c,v 1.47 2000/10/21 17:38:08 dbeu Exp $ */ +/* $Id: interbase.c,v 1.48 2000/10/25 17:43:52 andrei Exp $ */ /* TODO: Arrays, roles? @@ -509,12 +509,12 @@ REGISTER_INI_ENTRIES(); - le_result = register_list_destructors(_php_ibase_free_result, NULL, "interbase result"); - le_query = register_list_destructors(php_ibase_free_query_rsrc, NULL, "interbase query"); - le_blob = register_list_destructors(_php_ibase_free_blob, NULL, "interbase blob"); - le_link = register_list_destructors(_php_ibase_close_link, NULL, "interbase link"); - le_plink = register_list_destructors(php_ibase_commit_link_rsrc, _php_ibase_close_plink, "interbase link persistent"); - le_trans = register_list_destructors(_php_ibase_free_trans, NULL, "interbase transaction"); + le_result = zend_register_list_destructors_ex(_php_ibase_free_result, NULL, "interbase result", module_number); + le_query = zend_register_list_destructors_ex(php_ibase_free_query_rsrc, NULL, "interbase query", module_number); + le_blob = zend_register_list_destructors_ex(_php_ibase_free_blob, NULL, "interbase blob", module_number); + le_link = zend_register_list_destructors_ex(_php_ibase_close_link, NULL, "interbase link", module_number); + le_plink = zend_register_list_destructors_ex(php_ibase_commit_link_rsrc, _php_ibase_close_plink, "interbase link persistent", module_number); + le_trans = zend_register_list_destructors_ex(_php_ibase_free_trans, NULL, "interbase transaction", module_number); REGISTER_LONG_CONSTANT("IBASE_DEFAULT", PHP_IBASE_DEFAULT, CONST_PERSISTENT); REGISTER_LONG_CONSTANT("IBASE_TEXT", PHP_IBASE_TEXT, CONST_PERSISTENT); @@ -596,7 +596,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "Interbase Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.47 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.48 $"); #ifdef COMPILE_DL_INTERBASE php_info_print_table_row(2, "Dynamic Module", "yes"); #endif Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.38 php4/ext/java/java.c:1.39 --- php4/ext/java/java.c:1.38 Fri Oct 20 11:25:04 2000 +++ php4/ext/java/java.c Wed Oct 25 10:43:56 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: java.c,v 1.38 2000/10/20 18:25:04 andrei Exp $ */ +/* $Id: java.c,v 1.39 2000/10/25 17:43:56 andrei Exp $ */ /* * This module implements Zend OO syntax overloading support for Java @@ -613,7 +613,7 @@ zend_register_internal_class(&java_class_entry); - le_jobject = register_list_destructors(_php_java_destructor,NULL,"java"); + le_jobject = zend_register_list_destructors_ex(_php_java_destructor, NULL, "java", module_number); REGISTER_INI_ENTRIES(); Index: php4/ext/ldap/ldap.c diff -u php4/ext/ldap/ldap.c:1.68 php4/ext/ldap/ldap.c:1.69 --- php4/ext/ldap/ldap.c:1.68 Sun Oct 22 04:25:47 2000 +++ php4/ext/ldap/ldap.c Wed Oct 25 10:43:56 2000 @@ -23,7 +23,7 @@ */ -/* $Id: ldap.c,v 1.68 2000/10/22 11:25:47 venaas Exp $ */ +/* $Id: ldap.c,v 1.69 2000/10/25 17:43:56 andrei Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -181,8 +181,8 @@ REGISTER_MAIN_LONG_CONSTANT("GSLC_SSL_TWOWAY_AUTH", GSLC_SSL_TWOWAY_AUTH, CONST_PERSISTENT | CONST_CS); #endif - le_result = register_list_destructors(_free_ldap_result, NULL, "ldap result"); - le_link = register_list_destructors(_close_ldap_link, NULL, "ldap link"); + le_result = zend_register_list_destructors_ex(_free_ldap_result, NULL, "ldap result", module_number); + le_link = zend_register_list_destructors_ex(_close_ldap_link, NULL, "ldap link", module_number); ldap_module_entry.type = type; @@ -224,7 +224,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "LDAP Support", "enabled" ); - php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.68 2000/10/22 11:25:47 venaas Exp $" ); + php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.69 2000/10/25 17:43:56 andrei Exp $" ); php_info_print_table_row(2, "Total Links", maxl ); #ifdef LDAP_API_VERSION snprintf(ldapapiversion, 31, "%ld", LDAP_API_VERSION); Index: php4/ext/mcal/php_mcal.c diff -u php4/ext/mcal/php_mcal.c:1.36 php4/ext/mcal/php_mcal.c:1.37 --- php4/ext/mcal/php_mcal.c:1.36 Fri Oct 20 11:25:04 2000 +++ php4/ext/mcal/php_mcal.c Wed Oct 25 10:43:56 2000 @@ -152,7 +152,7 @@ PHP_MINIT_FUNCTION(mcal) { - le_mcal = register_list_destructors(cal_close_it,NULL,"mcal"); + le_mcal = zend_register_list_destructors_ex(cal_close_it, NULL, "mcal", module_number); REGISTER_MAIN_LONG_CONSTANT("MCAL_SUNDAY",SUNDAY, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("MCAL_MONDAY",MONDAY, CONST_PERSISTENT | CONST_CS); Index: php4/ext/msql/php_msql.c diff -u php4/ext/msql/php_msql.c:1.23 php4/ext/msql/php_msql.c:1.24 --- php4/ext/msql/php_msql.c:1.23 Fri Oct 20 11:25:05 2000 +++ php4/ext/msql/php_msql.c Wed Oct 25 10:43:57 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_msql.c,v 1.23 2000/10/20 18:25:05 andrei Exp $ */ +/* $Id: php_msql.c,v 1.24 2000/10/25 17:43:57 andrei Exp $ */ #include "php.h" #include "php_msql.h" @@ -162,9 +162,9 @@ msql_globals.max_links=-1; } msql_globals.num_persistent=0; - msql_globals.le_query = register_list_destructors(_delete_query,NULL,"msql query"); - msql_globals.le_link = register_list_destructors(_close_msql_link,NULL,"msql link"); - msql_globals.le_plink = register_list_destructors(NULL,_close_msql_plink, "msql link persistent"); + msql_globals.le_query = zend_register_list_destructors_ex(_delete_query, NULL, "msql query", module_number); + msql_globals.le_link = zend_register_list_destructors_ex(_close_msql_link, NULL, "msql link", module_number); + msql_globals.le_plink = zend_register_list_destructors_ex(NULL, _close_msql_plink, "msql link persistent", module_number); msql_module_entry.type = type; Index: php4/ext/mssql/php_mssql.c diff -u php4/ext/mssql/php_mssql.c:1.30 php4/ext/mssql/php_mssql.c:1.31 --- php4/ext/mssql/php_mssql.c:1.30 Fri Oct 20 13:58:57 2000 +++ php4/ext/mssql/php_mssql.c Wed Oct 25 10:43:57 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.30 2000/10/20 20:58:57 fmk Exp $ */ +/* $Id: php_mssql.c,v 1.31 2000/10/25 17:43:57 andrei Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -220,9 +220,9 @@ #endif REGISTER_INI_ENTRIES(); - le_result = register_list_destructors(_free_mssql_result, NULL, "mssql result"); - le_link = register_list_destructors(_close_mssql_link, NULL, "mssql link"); - le_plink = register_list_destructors(NULL, _close_mssql_plink, "mssql link persistent"); + le_result = zend_register_list_destructors_ex(_free_mssql_result, NULL, "mssql result", module_number); + le_link = zend_register_list_destructors_ex(_close_mssql_link, NULL, "mssql link", module_number); + le_plink = zend_register_list_destructors_ex(NULL, _close_mssql_plink, "mssql link persistent", module_number); mssql_module_entry.type = type; if (dbinit()==FAIL) { Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.55 php4/ext/mysql/php_mysql.c:1.56 --- php4/ext/mysql/php_mysql.c:1.55 Fri Oct 20 11:25:05 2000 +++ php4/ext/mysql/php_mysql.c Wed Oct 25 10:43:57 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.55 2000/10/20 18:25:05 andrei Exp $ */ +/* $Id: php_mysql.c,v 1.56 2000/10/25 17:43:57 andrei Exp $ */ /* TODO: @@ -261,9 +261,9 @@ ZEND_INIT_MODULE_GLOBALS(mysql, php_mysql_init_globals, NULL); REGISTER_INI_ENTRIES(); - le_result = register_list_destructors(_free_mysql_result,NULL,"mysql result"); - le_link = register_list_destructors(_close_mysql_link,NULL, "mysql link"); - le_plink = register_list_destructors(NULL,_close_mysql_plink, "mysql link persistent"); + le_result = zend_register_list_destructors_ex(_free_mysql_result, NULL, "mysql result", module_number); + le_link = zend_register_list_destructors_ex(_close_mysql_link, NULL, "mysql link", module_number); + le_plink = zend_register_list_destructors_ex(NULL, _close_mysql_plink, "mysql link persistent", module_number); mysql_module_entry.type = type; REGISTER_LONG_CONSTANT("MYSQL_ASSOC", MYSQL_ASSOC, CONST_CS | CONST_PERSISTENT); Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.100 php4/ext/oci8/oci8.c:1.101 --- php4/ext/oci8/oci8.c:1.100 Sun Oct 22 12:33:59 2000 +++ php4/ext/oci8/oci8.c Wed Oct 25 10:43:57 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.100 2000/10/22 19:33:59 thies Exp $ */ +/* $Id: oci8.c,v 1.101 2000/10/25 17:43:57 andrei Exp $ */ /* TODO list: * @@ -362,11 +362,11 @@ php_oci_init_globals(OCILS_C); #endif - le_stmt = register_list_destructors(_oci_stmt_list_dtor, NULL, "oci8 statement"); - le_conn = register_list_destructors(php_oci_free_conn_list, NULL, "oci8 connection"); - le_desc = register_list_destructors(_oci_descriptor_list_dtor, NULL, "oci8 descriptor"); - le_server = register_list_destructors(_oci_server_list_dtor, NULL, "oci8 server"); - le_session = register_list_destructors(_oci_session_list_dtor, NULL, "oci8 session"); + le_stmt = zend_register_list_destructors_ex(_oci_stmt_list_dtor, NULL, "oci8 statement", module_number); + le_conn = zend_register_list_destructors_ex(php_oci_free_conn_list, NULL, "oci8 connection", module_number); + le_desc = zend_register_list_destructors_ex(_oci_descriptor_list_dtor, NULL, "oci8 descriptor", module_number); + le_server = zend_register_list_destructors_ex(_oci_server_list_dtor, NULL, "oci8 server", module_number); + le_session = zend_register_list_destructors_ex(_oci_session_list_dtor, NULL, "oci8 session", module_number); INIT_CLASS_ENTRY(oci_lob_class_entry, "OCI-Lob", php_oci_lob_class_functions); @@ -491,7 +491,7 @@ php_info_print_table_start(); php_info_print_table_row(2, "OCI8 Support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.100 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.101 $"); #ifndef PHP_WIN32 php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION ); php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR ); Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.62 php4/ext/odbc/php_odbc.c:1.63 --- php4/ext/odbc/php_odbc.c:1.62 Fri Oct 20 11:25:08 2000 +++ php4/ext/odbc/php_odbc.c Wed Oct 25 10:43:58 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.62 2000/10/20 18:25:08 andrei Exp $ */ +/* $Id: php_odbc.c,v 1.63 2000/10/25 17:43:58 andrei Exp $ */ #include "php.h" #include "php_globals.h" @@ -331,9 +331,9 @@ #endif REGISTER_INI_ENTRIES(); - le_result = register_list_destructors(_free_odbc_result, NULL, "odbc result"); - le_conn = register_list_destructors(_close_odbc_conn, NULL, "odbc link"); - le_pconn = register_list_destructors(NULL, _close_odbc_pconn, "odbc link persistent"); + le_result = zend_register_list_destructors_ex(_free_odbc_result, NULL, "odbc result", module_number); + le_conn = zend_register_list_destructors_ex(_close_odbc_conn, NULL, "odbc link", module_number); + le_pconn = zend_register_list_destructors_ex(NULL, _close_odbc_pconn, "odbc link persistent", module_number); odbc_module_entry.type = type; REGISTER_LONG_CONSTANT("ODBC_BINMODE_PASSTHRU", 0, CONST_CS | CONST_PERSISTENT); Index: php4/ext/odbc/velocis.c diff -u php4/ext/odbc/velocis.c:1.22 php4/ext/odbc/velocis.c:1.23 --- php4/ext/odbc/velocis.c:1.22 Fri Oct 20 11:25:09 2000 +++ php4/ext/odbc/velocis.c Wed Oct 25 10:43:58 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: velocis.c,v 1.22 2000/10/20 18:25:09 andrei Exp $ */ +/* $Id: velocis.c,v 1.23 2000/10/25 17:43:58 andrei Exp $ */ /* * TODO: @@ -104,8 +104,8 @@ php_velocis_module.max_links = -1; } php_velocis_module.num_links = 0; - php_velocis_module.le_link = register_list_destructors(_close_velocis_link,NULL,"velocis link"); - php_velocis_module.le_result = register_list_destructors(_free_velocis_result,NULL,"velocis result"); + php_velocis_module.le_link = zend_register_list_destructors_ex(_close_velocis_link, NULL, "velocis link", module_number); + php_velocis_module.le_result = zend_register_list_destructors_ex(_free_velocis_result, NULL, "velocis result", module_number); return SUCCESS; } Index: php4/ext/oracle/oracle.c diff -u php4/ext/oracle/oracle.c:1.55 php4/ext/oracle/oracle.c:1.56 --- php4/ext/oracle/oracle.c:1.55 Fri Oct 20 11:25:09 2000 +++ php4/ext/oracle/oracle.c Wed Oct 25 10:43:58 2000 @@ -290,9 +290,9 @@ php_ora_init_globals(ORALS_C); #endif - le_cursor = register_list_destructors(php_close_ora_cursor, NULL, "oracle cursor"); - le_conn = register_list_destructors(_close_oraconn, NULL, "oracle link"); - le_pconn = register_list_destructors(NULL, _close_oraconn, "oracle link persistent"); + le_cursor = zend_register_list_destructors_ex(php_close_ora_cursor, NULL, "oracle cursor", module_number); + le_conn = zend_register_list_destructors_ex(_close_oraconn, NULL, "oracle link", module_number); + le_pconn = zend_register_list_destructors_ex(NULL, _close_oraconn, "oracle link persistent", module_number); REGISTER_LONG_CONSTANT("ORA_BIND_INOUT", 0, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("ORA_BIND_IN", 1, CONST_CS | CONST_PERSISTENT); Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.56 php4/ext/pdf/pdf.c:1.57 --- php4/ext/pdf/pdf.c:1.56 Fri Oct 20 11:25:10 2000 +++ php4/ext/pdf/pdf.c Wed Oct 25 10:43:58 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.56 2000/10/20 18:25:10 andrei Exp $ */ +/* $Id: pdf.c,v 1.57 2000/10/25 17:43:58 andrei Exp $ */ /* pdflib 2.02 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -237,9 +237,9 @@ PHP_MINIT_FUNCTION(pdf) { - PDF_GLOBAL(le_pdf_image) = register_list_destructors(_free_pdf_image, NULL, "pdf image"); - PDF_GLOBAL(le_outline) = register_list_destructors(_free_outline, NULL, "pdf outline"); - PDF_GLOBAL(le_pdf) = register_list_destructors(_free_pdf_doc, NULL, "pdf document"); + PDF_GLOBAL(le_pdf_image) = zend_register_list_destructors_ex(_free_pdf_image, NULL, "pdf image", module_number); + PDF_GLOBAL(le_outline) = zend_register_list_destructors_ex(_free_outline, NULL, "pdf outline", module_number); + PDF_GLOBAL(le_pdf) = zend_register_list_destructors_ex(_free_pdf_doc, NULL, "pdf document", module_number); return SUCCESS; } Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.76 php4/ext/pgsql/pgsql.c:1.77 --- php4/ext/pgsql/pgsql.c:1.76 Fri Oct 20 11:25:10 2000 +++ php4/ext/pgsql/pgsql.c Wed Oct 25 10:43:59 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.76 2000/10/20 18:25:10 andrei Exp $ */ +/* $Id: pgsql.c,v 1.77 2000/10/25 17:43:59 andrei Exp $ */ #include <stdlib.h> @@ -179,12 +179,12 @@ REGISTER_INI_ENTRIES(); - le_link = register_list_destructors(_close_pgsql_link,NULL, "pgsql link"); - le_plink = register_list_destructors(NULL,_close_pgsql_plink, "pgsql link persistent"); + le_link = zend_register_list_destructors_ex(_close_pgsql_link, NULL, "pgsql link", module_number); + le_plink = zend_register_list_destructors_ex(NULL, _close_pgsql_plink, "pgsql link persistent", module_number); /* PGG(le_result = register_list_destructors(PQclear,NULL); */ - le_result = register_list_destructors(_free_result,NULL, "pgsql result"); - le_lofp = register_list_destructors(_free_ptr,NULL, "pgsql large object"); - le_string = register_list_destructors(_free_ptr,NULL, "pgsql string"); + le_result = zend_register_list_destructors_ex(_free_result, NULL, "pgsql result", module_number); + le_lofp = zend_register_list_destructors_ex(_free_ptr, NULL, "pgsql large object", module_number); + le_string = zend_register_list_destructors_ex(_free_ptr, NULL, "pgsql string", module_number); REGISTER_LONG_CONSTANT("PGSQL_ASSOC", PGSQL_ASSOC, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PGSQL_NUM", PGSQL_NUM, CONST_CS | CONST_PERSISTENT); Index: php4/ext/pspell/pspell.c diff -u php4/ext/pspell/pspell.c:1.11 php4/ext/pspell/pspell.c:1.12 --- php4/ext/pspell/pspell.c:1.11 Fri Oct 20 11:25:10 2000 +++ php4/ext/pspell/pspell.c Wed Oct 25 10:43:59 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pspell.c,v 1.11 2000/10/20 18:25:10 andrei Exp $ */ +/* $Id: pspell.c,v 1.12 2000/10/25 17:43:59 andrei Exp $ */ #define IS_EXT_MODULE @@ -85,8 +85,8 @@ REGISTER_MAIN_LONG_CONSTANT("PSPELL_NORMAL", PSPELL_NORMAL, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PSPELL_BAD_SPELLERS", PSPELL_BAD_SPELLERS, CONST_PERSISTENT | CONST_CS); REGISTER_MAIN_LONG_CONSTANT("PSPELL_RUN_TOGETHER", PSPELL_RUN_TOGETHER, CONST_PERSISTENT | CONST_CS); - le_pspell = register_list_destructors(php_pspell_close,NULL,"pspell"); - le_pspell_config = register_list_destructors(php_pspell_close_config,NULL,"pspell config"); + le_pspell = zend_register_list_destructors_ex(php_pspell_close, NULL, "pspell", module_number); + le_pspell_config = zend_register_list_destructors_ex(php_pspell_close_config, NULL, "pspell config", module_number); return SUCCESS; } Index: php4/ext/sablot/sablot.c diff -u php4/ext/sablot/sablot.c:1.10 php4/ext/sablot/sablot.c:1.11 --- php4/ext/sablot/sablot.c:1.10 Fri Oct 20 11:25:11 2000 +++ php4/ext/sablot/sablot.c Wed Oct 25 10:43:59 2000 @@ -140,7 +140,7 @@ PHP_MINIT_FUNCTION(sablot) { SABLOTLS_FETCH(); - SABLOTG(le_sablot) = register_list_destructors(_php_sablot_free_processor, NULL, "sablotron"); + SABLOTG(le_sablot) = zend_register_list_destructors_ex(_php_sablot_free_processor, NULL, "sablotron", module_number); return SUCCESS; } Index: php4/ext/shmop/shmop.c diff -u php4/ext/shmop/shmop.c:1.6 php4/ext/shmop/shmop.c:1.7 --- php4/ext/shmop/shmop.c:1.6 Fri Oct 20 11:25:11 2000 +++ php4/ext/shmop/shmop.c Wed Oct 25 10:44:00 2000 @@ -69,7 +69,7 @@ PHP_MINIT_FUNCTION(shmop) { - shm_type = register_list_destructors(rsclean, NULL, "shmop"); + shm_type = zend_register_list_destructors_ex(rsclean, NULL, "shmop", module_number); return SUCCESS; } Index: php4/ext/sockets/sockets.c diff -u php4/ext/sockets/sockets.c:1.19 php4/ext/sockets/sockets.c:1.20 --- php4/ext/sockets/sockets.c:1.19 Sun Oct 22 16:43:48 2000 +++ php4/ext/sockets/sockets.c Wed Oct 25 10:44:00 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.19 2000/10/22 23:43:48 chrisv Exp $ */ +/* $Id: sockets.c,v 1.20 2000/10/25 17:44:00 andrei Exp $ */ #include "php.h" @@ -200,8 +200,8 @@ PHP_MINIT_FUNCTION(sockets) { SOCKETSLS_FETCH(); - SOCKETSG(le_destroy) = register_list_destructors(destroy_fd_sets, NULL, "sockets file descriptor set"); - SOCKETSG(le_iov) = register_list_destructors(destroy_iovec, NULL, "sockets i/o vector"); + SOCKETSG(le_destroy) = zend_register_list_destructors_ex(destroy_fd_sets, NULL, "sockets file descriptor set", module_number); + SOCKETSG(le_iov) = zend_register_list_destructors_ex(destroy_iovec, NULL, "sockets i/o vector", module_number); REGISTER_INI_ENTRIES(); Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.46 php4/ext/standard/dir.c:1.47 --- php4/ext/standard/dir.c:1.46 Fri Oct 20 11:25:12 2000 +++ php4/ext/standard/dir.c Wed Oct 25 10:44:00 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.46 2000/10/20 18:25:12 andrei Exp $ */ +/* $Id: dir.c,v 1.47 2000/10/25 17:44:00 andrei Exp $ */ /* {{{ includes/startup/misc */ @@ -126,7 +126,7 @@ { zend_class_entry dir_class_entry; - le_dirp = register_list_destructors(_dir_dtor,NULL, "dir"); + le_dirp = zend_register_list_destructors_ex(_dir_dtor, NULL, "dir", module_number); INIT_CLASS_ENTRY(dir_class_entry, "Directory", php_dir_class_functions); dir_class_entry_ptr = zend_register_internal_class(&dir_class_entry); Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.117 php4/ext/standard/file.c:1.118 --- php4/ext/standard/file.c:1.117 Fri Oct 20 11:25:12 2000 +++ php4/ext/standard/file.c Wed Oct 25 10:44:00 2000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.117 2000/10/20 18:25:12 andrei Exp $ */ +/* $Id: file.c,v 1.118 2000/10/25 17:44:00 andrei Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -168,9 +168,9 @@ PHP_MINIT_FUNCTION(file) { - le_fopen = register_list_destructors(_file_fopen_dtor, NULL, "file"); - le_popen = register_list_destructors(_file_popen_dtor, NULL, "pipe"); - le_socket = register_list_destructors(_file_socket_dtor, NULL, "socket"); + le_fopen = zend_register_list_destructors_ex(_file_fopen_dtor, NULL, "file", module_number); + le_popen = zend_register_list_destructors_ex(_file_popen_dtor, NULL, "pipe", module_number); + le_socket = zend_register_list_destructors_ex(_file_socket_dtor, NULL, "socket", module_number); #ifdef ZTS file_globals_id = ts_allocate_id(sizeof(php_file_globals), (ts_allocate_ctor) php_file_init_globals, NULL); Index: php4/ext/sybase/php_sybase_db.c diff -u php4/ext/sybase/php_sybase_db.c:1.7 php4/ext/sybase/php_sybase_db.c:1.8 --- php4/ext/sybase/php_sybase_db.c:1.7 Fri Oct 20 11:25:12 2000 +++ php4/ext/sybase/php_sybase_db.c Wed Oct 25 10:44:01 2000 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_db.c,v 1.7 2000/10/20 18:25:12 andrei Exp $ */ +/* $Id: php_sybase_db.c,v 1.8 2000/10/25 17:44:01 andrei Exp $ */ #include "php.h" @@ -223,9 +223,9 @@ } php_sybase_module.num_persistent=0; - php_sybase_module.le_link = register_list_destructors(_close_sybase_link,NULL, "sybase-db link"); - php_sybase_module.le_plink = register_list_destructors(NULL,_close_sybase_plink, "sybase-db link persistent"); - php_sybase_module.le_result = register_list_destructors(_free_sybase_result,NULL, "sybase-db result"); + php_sybase_module.le_link = zend_register_list_destructors_ex(_close_sybase_link, NULL, "sybase-db link", module_number); + php_sybase_module.le_plink = zend_register_list_destructors_ex(NULL, _close_sybase_plink, "sybase-db link persistent", module_number); + php_sybase_module.le_result = zend_register_list_destructors_ex(_free_sybase_result, NULL, "sybase-db result", module_number); return SUCCESS; } Index: php4/ext/sybase_ct/php_sybase_ct.c diff -u php4/ext/sybase_ct/php_sybase_ct.c:1.36 php4/ext/sybase_ct/php_sybase_ct.c:1.37 --- php4/ext/sybase_ct/php_sybase_ct.c:1.36 Fri Oct 20 11:25:13 2000 +++ php4/ext/sybase_ct/php_sybase_ct.c Wed Oct 25 10:44:01 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sybase_ct.c,v 1.36 2000/10/20 18:25:13 andrei Exp $ */ +/* $Id: php_sybase_ct.c,v 1.37 2000/10/25 17:44:01 andrei Exp $ */ #include "php.h" @@ -322,9 +322,9 @@ REGISTER_INI_ENTRIES(); - le_link = register_list_destructors(_close_sybase_link,NULL, "sybase-ct link"); - le_plink = register_list_destructors(NULL,_close_sybase_plink, "sybase-ct link persistent"); - le_result = register_list_destructors(php_free_sybase_result,NULL, "sybase-ct result"); + le_link = zend_register_list_destructors_ex(_close_sybase_link, NULL, "sybase-ct link", module_number); + le_plink = zend_register_list_destructors_ex(NULL, _close_sybase_plink, "sybase-ct link persistent", module_number); + le_result = zend_register_list_destructors_ex(php_free_sybase_result, NULL, "sybase-ct result", module_number); return SUCCESS; } Index: php4/ext/sysvsem/sysvsem.c diff -u php4/ext/sysvsem/sysvsem.c:1.25 php4/ext/sysvsem/sysvsem.c:1.26 --- php4/ext/sysvsem/sysvsem.c:1.25 Fri Oct 20 11:25:13 2000 +++ php4/ext/sysvsem/sysvsem.c Wed Oct 25 10:44:01 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvsem.c,v 1.25 2000/10/20 18:25:13 andrei Exp $ */ +/* $Id: sysvsem.c,v 1.26 2000/10/25 17:44:01 andrei Exp $ */ /* This has been built and tested on Solaris 2.6 and Linux 2.1.122. * It may not compile or execute correctly on other systems. @@ -117,7 +117,7 @@ PHP_MINIT_FUNCTION(sysvsem) { - php_sysvsem_module.le_sem = register_list_destructors(release_sysvsem_sem, NULL, "sysvsem"); + php_sysvsem_module.le_sem = zend_register_list_destructors_ex(release_sysvsem_sem, NULL, "sysvsem", module_number); return SUCCESS; } Index: php4/ext/sysvshm/sysvshm.c diff -u php4/ext/sysvshm/sysvshm.c:1.31 php4/ext/sysvshm/sysvshm.c:1.32 --- php4/ext/sysvshm/sysvshm.c:1.31 Fri Oct 20 11:25:13 2000 +++ php4/ext/sysvshm/sysvshm.c Wed Oct 25 10:44:01 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sysvshm.c,v 1.31 2000/10/20 18:25:13 andrei Exp $ */ +/* $Id: sysvshm.c,v 1.32 2000/10/25 17:44:01 andrei Exp $ */ /* This has been built and tested on Solaris 2.6. * It may not compile or execute correctly on other systems. @@ -67,7 +67,7 @@ PHP_MINIT_FUNCTION(sysvshm) { - php_sysvshm.le_shm = register_list_destructors(php_release_sysvshm, NULL, "sysvshm"); + php_sysvshm.le_shm = zend_register_list_destructors_ex(php_release_sysvshm, NULL, "sysvshm", module_number); if (cfg_get_long("sysvshm.init_mem", &php_sysvshm.init_mem)==FAILURE) { php_sysvshm.init_mem=10000; Index: php4/ext/wddx/wddx.c diff -u php4/ext/wddx/wddx.c:1.57 php4/ext/wddx/wddx.c:1.58 --- php4/ext/wddx/wddx.c:1.57 Fri Oct 20 11:25:14 2000 +++ php4/ext/wddx/wddx.c Wed Oct 25 10:44:02 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: wddx.c,v 1.57 2000/10/20 18:25:14 andrei Exp $ */ +/* $Id: wddx.c,v 1.58 2000/10/25 17:44:02 andrei Exp $ */ #include "php.h" #include "php_wddx.h" @@ -242,7 +242,7 @@ /* {{{ php_minit_wddx */ PHP_MINIT_FUNCTION(wddx) { - le_wddx = register_list_destructors(php_free_wddx_packet, NULL, "wddx"); + le_wddx = zend_register_list_destructors_ex(php_free_wddx_packet, NULL, "wddx", module_number); return SUCCESS; } Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.62 php4/ext/xml/xml.c:1.63 --- php4/ext/xml/xml.c:1.62 Fri Oct 20 11:25:15 2000 +++ php4/ext/xml/xml.c Wed Oct 25 10:44:02 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.62 2000/10/20 18:25:15 andrei Exp $ */ +/* $Id: xml.c,v 1.63 2000/10/25 17:44:02 andrei Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -159,7 +159,7 @@ PHP_MINIT_FUNCTION(xml) { - le_xml_parser = register_list_destructors(xml_parser_dtor, NULL, "xml"); + le_xml_parser = zend_register_list_destructors_ex(xml_parser_dtor, NULL, "xml", module_number); #ifdef ZTS xml_globals_id = ts_allocate_id(sizeof(php_xml_globals), (ts_allocate_ctor) php_xml_init_globals, NULL); Index: php4/ext/zlib/zlib.c diff -u php4/ext/zlib/zlib.c:1.61 php4/ext/zlib/zlib.c:1.62 --- php4/ext/zlib/zlib.c:1.61 Mon Oct 23 07:04:54 2000 +++ php4/ext/zlib/zlib.c Wed Oct 25 10:44:02 2000 @@ -16,7 +16,7 @@ | Stefan Röhrich <sr@linux.de> | +----------------------------------------------------------------------+ */ -/* $Id: zlib.c,v 1.61 2000/10/23 14:04:54 sas Exp $ */ +/* $Id: zlib.c,v 1.62 2000/10/25 17:44:02 andrei Exp $ */ #define IS_EXT_MODULE #ifndef PHP_WIN32 @@ -147,7 +147,7 @@ #else ZLIBG(gzgetss_state)=0; #endif - le_zp = register_list_destructors(phpi_destructor_gzclose,NULL,"zlib"); + le_zp = zend_register_list_destructors_ex(phpi_destructor_gzclose, NULL, "zlib", module_number); #if HAVE_FOPENCOOKIE