Use zend_register_list_destructors_ex() instead.

diff --git a/ext/aspell/aspell.c b/ext/aspell/aspell.c
index c8f667dabeed7af6a869e4e03a90ae5b1e5fe97d..ad2f7966cf61142ea90a0462fead4520483dec37 100644 (file)
--- a/ext/aspell/aspell.c
+++ b/ext/aspell/aspell.c
@@ -61,7 +61,7 @@ static void php_aspell_close(zend_rsrc_list_entry *rsrc)
 
 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;
 
 }

diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c
index b4eade66d9ee521e4d8098fbc0ab46c0fe1f2d56..5bf8ea2900f01b99499dd898a7803d45b55cfcd9 100644 (file)
--- a/ext/cpdf/cpdf.c
+++ b/ext/cpdf/cpdf.c
@@ -174,8 +174,8 @@ static void _free_doc(zend_rsrc_list_entry *rsrc)
 
 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;
 }
 

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index ac05c41b5b74e471f225d99a5b9626a7c4367aeb..a1dc80301c1a6439ccf13089463a5d68c7da490c 100644 (file)
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -134,7 +134,7 @@ PHP_MINFO_FUNCTION(curl)
 
 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);

diff --git a/ext/db/db.c b/ext/db/db.c
index 406ef9d3a9cc285f85797936faa1970203d146d8..9f42cd8cfc513db84d1f8a7ebae9693e07a6d96b 100644 (file)
--- a/ext/db/db.c
+++ b/ext/db/db.c
@@ -1122,7 +1122,7 @@ PHP_MINIT_FUNCTION(db)
        }
 #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;
 }
 

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index 684dd25ff2a1ace30bec452a8b7d88e0533eb0a5..558465725c143cba007dabeaa30e5d40adea9c5e 100644 (file)
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -190,8 +190,8 @@ static void dba_close(zend_rsrc_list_entry *rsrc)
 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;
 }
 

diff --git a/ext/dbase/dbase.c b/ext/dbase/dbase.c
index dbf4706430db964c1212e336d3518ece89a3e100..baa2520bd5f61e381a82ace2c8c73023891740c6 100644 (file)
--- a/ext/dbase/dbase.c
+++ b/ext/dbase/dbase.c
@@ -82,7 +82,7 @@ PHP_MINIT_FUNCTION(dbase)
        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;
 }
 

diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index 49431aac749ca2ddf595e195741afd0fb54fb48f..5cf116fc0a87b3aec81975fe05bfbb901ce686c5 100644 (file)
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -133,12 +133,12 @@ PHP_MINIT_FUNCTION(domxml)
   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);

diff --git a/ext/fdf/fdf.c b/ext/fdf/fdf.c
index 998483d9469fcf18084729391d165f37542e6b10..e6ef3b8bd9d3d405c06445e798e7abd96d7c0a0f 100644 (file)
--- a/ext/fdf/fdf.c
+++ b/ext/fdf/fdf.c
@@ -118,7 +118,7 @@ static sapi_post_entry supported_post_entries[] = {
 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);

diff --git a/ext/ftp/php_ftp.c b/ext/ftp/php_ftp.c
index a457aab211f4df2d65723ca90636cee81b1b93d1..a084cb7623530ea2a34f9b2555fa30a9a36e8596 100644 (file)
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@@ -92,7 +92,7 @@ static void ftp_destructor_ftpbuf(zend_rsrc_list_entry *rsrc)
 
 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,

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 9cbb0a9f0d241b253280436497ee7db97cb88dd5..0dacca80eaf701ad096200a8585f0f4735848e2e 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -225,14 +225,14 @@ PHP_MINIT_FUNCTION(gd)
                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);

diff --git a/ext/hyperwave/hw.c b/ext/hyperwave/hw.c
index 69dbe97c0a3f81988b529432bbd6a35163dbe007..d5e802efb1e2741a447b64f69cc7e4f8709cb236 100644 (file)
--- a/ext/hyperwave/hw.c
+++ b/ext/hyperwave/hw.c
@@ -194,9 +194,9 @@ PHP_MINIT_FUNCTION(hw) {
        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);

diff --git a/ext/icap/php_icap.c b/ext/icap/php_icap.c
index 6f98c3b1517895e885543a92c2e59d22058b0314..308a20d92069f007128247d97125089df2d84d43 100644 (file)
--- a/ext/icap/php_icap.c
+++ b/ext/icap/php_icap.c
@@ -137,7 +137,7 @@ PHP_MINFO_FUNCTION(icap)
 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;
 }

diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
index c8c5f4aeaf2452a9d09a9fb532f7c5a9fb4c693c..1888960b3f640b0013e28a7a6e7db95c925ba9fb 100644 (file)
--- a/ext/imap/php_imap.c
+++ b/ext/imap/php_imap.c
@@ -592,11 +592,11 @@ PHP_MINIT_FUNCTION(imap)
        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;
 }

diff --git a/ext/ingres_ii/ii.c b/ext/ingres_ii/ii.c
index d7871f1e078aee626e376203e217e0ade1d0809c..9d0402bef6d3ccfd9241ce60149efd975254a708 100644 (file)
--- a/ext/ingres_ii/ii.c
+++ b/ext/ingres_ii/ii.c
@@ -256,8 +256,8 @@ PHP_MINIT_FUNCTION(ii)
   
   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;
 

diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c
index b22fbeb7e5136d809d6a50015ad90eaaf4fb9e31..23057bb6d44ae98f2aa56cb11f63a95e9deb48a8 100644 (file)
--- a/ext/interbase/interbase.c
+++ b/ext/interbase/interbase.c
@@ -509,12 +509,12 @@ PHP_MINIT_FUNCTION(ibase)
 
        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);

diff --git a/ext/java/java.c b/ext/java/java.c
index 1e3065ce176d4b26aa56e75106872f081d015813..dddd85edd674eb83ffb5e4f3b4e80986dda49384 100644 (file)
--- a/ext/java/java.c
+++ b/ext/java/java.c
@@ -613,7 +613,7 @@ PHP_MINIT_FUNCTION(java) {
 
   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();
 

diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c
index dc78202763767e743a2290d64cc35f683b5f2ea8..6222c6de63f6ef852477ec33459c43ed6d1cc1c6 100644 (file)
--- a/ext/ldap/ldap.c
+++ b/ext/ldap/ldap.c
@@ -181,8 +181,8 @@ PHP_MINIT_FUNCTION(ldap)
        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;
 

diff --git a/ext/mcal/php_mcal.c b/ext/mcal/php_mcal.c
index a06cdfc67c6a912b25ff7e195737aee843c401bc..132f7119c20cd50c2a3f3b79ab43c7e159620281 100644 (file)
--- a/ext/mcal/php_mcal.c
+++ b/ext/mcal/php_mcal.c
@@ -152,7 +152,7 @@ PHP_MINFO_FUNCTION(mcal)
 
 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);

diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index bf2f54771f2f84db22ce68ff25c3a315c4114ec3..01a45b79c1028c706ca10a2f6ad84ac42b56a36e 100644 (file)
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -162,9 +162,9 @@ DLEXPORT PHP_MINIT_FUNCTION(msql)
                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;
 

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 53711c3af19884075def53a3b67bddf94eda59bc..dc97b5a34b330e22f443086675226a8aa06f7ac6 100644 (file)
--- a/ext/mssql/php_mssql.c
+++ b/ext/mssql/php_mssql.c
@@ -220,9 +220,9 @@ PHP_MINIT_FUNCTION(mssql)
 #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) {

diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c
index c5fc943e62c0f794fdd40c1eb41496058bba0f09..c397a96ce8d89b7569c47c04678366e6c39b6143 100644 (file)
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -261,9 +261,9 @@ PHP_MINIT_FUNCTION(mysql)
        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);

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index bc7639f2f5470a638c80e558c8918b99cf789785..805ab54f9bc6474fe9aeb080e6dca566b52145e8 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -362,11 +362,11 @@ PHP_MINIT_FUNCTION(oci)
        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);
 

diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index a3dfa88786a2f4b17b49206fdf29a2ab4adb6485..90a2a05d41943432e565bfc8224890d7c001cf37 100644 (file)
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -331,9 +331,9 @@ PHP_MINIT_FUNCTION(odbc)
 #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);

diff --git a/ext/odbc/velocis.c b/ext/odbc/velocis.c
index eaa62164ec75ad9ad31f477252b3f4e1e2653ce7..d4326d78d3f6a0239aa1afe6d1d065109f945fb9 100644 (file)
--- a/ext/odbc/velocis.c
+++ b/ext/odbc/velocis.c
@@ -104,8 +104,8 @@ PHP_MINIT_FUNCTION(velocis)
                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;
 }

diff --git a/ext/oracle/oracle.c b/ext/oracle/oracle.c
index a0f03b1a73abbdd0f3d448bd2613c0f0b5db1b8d..772c399a2b1c4b1d564869a814e7b3b140c16219 100644 (file)
--- a/ext/oracle/oracle.c
+++ b/ext/oracle/oracle.c
@@ -290,9 +290,9 @@ PHP_MINIT_FUNCTION(oracle)
        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);

diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c
index ef5c918af6ccc19af7cec757177e5eb02da53e48..efa3cb0740044697f072677e2145107beb0ee626 100644 (file)
--- a/ext/pdf/pdf.c
+++ b/ext/pdf/pdf.c
@@ -237,9 +237,9 @@ static size_t pdf_flushwrite(PDF *p, void *data, size_t size){
 
 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;
 }
 

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 9e4f9f7312c9a5a10c2decf8ccc222a4fa34dc60..1bbc9a86f2d6c225801bb12c0313847bf5280e34 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -179,12 +179,12 @@ PHP_MINIT_FUNCTION(pgsql)
 
        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);

diff --git a/ext/pspell/pspell.c b/ext/pspell/pspell.c
index 062697f433fbd836626edb2ef61defbece754394..9a0b93803dd83cd1768fd7b37da817fd2808e911 100644 (file)
--- a/ext/pspell/pspell.c
+++ b/ext/pspell/pspell.c
@@ -85,8 +85,8 @@ PHP_MINIT_FUNCTION(pspell){
        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;
 }
 

diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c
index 3fd289f3eeea92a49781aea74d836d3b4dbc99c0..1ff3f006b589f9bec2afa5f6a660af99bbeb2626 100644 (file)
--- a/ext/rpc/com/COM.c
+++ b/ext/rpc/com/COM.c
@@ -227,7 +227,7 @@ PHP_INI_END()
 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;

diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c
index 1e3065ce176d4b26aa56e75106872f081d015813..dddd85edd674eb83ffb5e4f3b4e80986dda49384 100644 (file)
--- a/ext/rpc/java/java.c
+++ b/ext/rpc/java/java.c
@@ -613,7 +613,7 @@ PHP_MINIT_FUNCTION(java) {
 
   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();
 

diff --git a/ext/sablot/sablot.c b/ext/sablot/sablot.c
index 747efaef53bbf1e7510ad79a3b8e899b3ed70ad7..9e05ae604046b042f070eb5c4a10da2cd9bbe9d5 100644 (file)
--- a/ext/sablot/sablot.c
+++ b/ext/sablot/sablot.c
@@ -140,7 +140,7 @@ ZEND_GET_MODULE(sablot)
 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;
 }
 

diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
index bbaadb84c0b462d69f2ca287c694225e2043cdb3..0ac6fe4a242d3f542645f75ec6376e452755865a 100644 (file)
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -69,7 +69,7 @@ static void rsclean(zend_rsrc_list_entry *rsrc)
 
 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;
 }

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index a907f2e0f633fd802596516ceda1d5cc988a401e..96dfc346dc73194249f66507452269aa2a55c45a 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -200,8 +200,8 @@ PHP_INI_END()
 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();
 

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index af3be3b4e5a4652d8c3b5f46981a21c47481f7e7..0595238f3cc8fc9b74a648755bc6cc9486305517 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -126,7 +126,7 @@ PHP_MINIT_FUNCTION(dir)
 {
        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);

diff --git a/ext/standard/file.c b/ext/standard/file.c
index 4d102fd2045e14c3e172256055675870c388e429..4fd186941e0284e17dd9ee876e6ceb22eb6b927d 100644 (file)
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -168,9 +168,9 @@ static void php_file_init_globals(php_file_globals *file_globals)
 
 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);

diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index 49aa046597b6e206e97ab0e425e4ae957a0349cb..849e32b84d614020c70325b0debbe4a53c66fe8b 100644 (file)
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -223,9 +223,9 @@ PHP_MINIT_FUNCTION(sybase)
        }
        
        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;
 }

diff --git a/ext/sybase_ct/php_sybase_ct.c b/ext/sybase_ct/php_sybase_ct.c
index 6c9ff7675f13159ecf7d9db5bf14ecdbacf00d6d..f0c95ba7c53de13489c7e63afe0a2174273cb0fe 100644 (file)
--- a/ext/sybase_ct/php_sybase_ct.c
+++ b/ext/sybase_ct/php_sybase_ct.c
@@ -322,9 +322,9 @@ PHP_MINIT_FUNCTION(sybase)
 
        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;
 }

diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index 36d33dfd00e7d184b44efce3e1d4ec34c7aeff3f..cd9a9f876e6d93f7e9b1cbe8cb1d42ff99421ca5 100644 (file)
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -117,7 +117,7 @@ static void release_sysvsem_sem(zend_rsrc_list_entry *rsrc)
 
 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;
 }

diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index 7826411df22bfab8235fb505891ede6e8e8478fc..b31a53d89924aabd9bbf6b3cfc93f40ac4fa19fa 100644 (file)
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -67,7 +67,7 @@ static void php_release_sysvshm(zend_rsrc_list_entry *rsrc)
 
 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;

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 4e5ed606cd74a65913d14ab798958514e3760cc5..f74e7c472c47dfb537a78146acd43c709aa38cbd 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -242,7 +242,7 @@ void php_wddx_destructor(wddx_packet *packet)
 /* {{{ 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;
 }

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 55da38a4edc61baedecef023459e238ec997fb27..1dd9ecc58abbfba2632990f1bf24d7d12f8b3a6b 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -159,7 +159,7 @@ static void php_xml_init_globals(php_xml_globals *xml_globals)
 
 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);

diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c
index b17a8da7091852b4c19de47b6f8d8c1b72e9b36b..349f9fcdcb54ff469d379e26554f6a0fd4c8f978 100644 (file)
--- a/ext/zlib/zlib.c
+++ b/ext/zlib/zlib.c
@@ -147,7 +147,7 @@ PHP_MINIT_FUNCTION(zlib)
 #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