In most user extensions functions like mysql_close() should use zend_list_close(...

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 5ba77972805ce3f39f34eeddcc59b7ad384f86c1..48fc27a8f2dc7895ee73596888ce16d632a26d63 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -3136,7 +3136,7 @@ PHP_FUNCTION(curl_close)
                return;
        }
 
-       zend_list_delete(Z_RES_P(zid));
+       zend_list_close(Z_RES_P(zid));
 }
 /* }}} */
 

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index f4245b93fdfaf096947e688e79897d04f70772a7..54cf68edce1b95c9435b682bfac072b82107018a 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -4011,7 +4011,7 @@ PHP_FUNCTION(imagepsfreefont)
        }
 
        ZEND_FETCH_RESOURCE(f_ind, int *, fnt, -1, "Type 1 font", le_ps_font);
-       zend_list_delete(Z_LVAL_P(fnt));
+       zend_list_close(Z_RES_P(fnt));
        RETURN_TRUE;
 }
 /* }}} */

diff --git a/ext/mcrypt/mcrypt.c b/ext/mcrypt/mcrypt.c
index 9183ed9b9f802a6aa13abaca4a0c381d41e725c9..84b0c9248c0064d36d0f9f8c0fd712d8368aec52 100644 (file)
--- a/ext/mcrypt/mcrypt.c
+++ b/ext/mcrypt/mcrypt.c
@@ -588,7 +588,7 @@ PHP_FUNCTION(mcrypt_generic_init)
        /* If this function fails, close the mcrypt module to prevent crashes
         * when further functions want to access this resource */
        if (result < 0) {
-               zend_list_delete(Z_RES_P(mcryptind));
+               zend_list_close(Z_RES_P(mcryptind));
                switch (result) {
                        case -3:
                                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Key length incorrect");
@@ -733,7 +733,7 @@ PHP_FUNCTION(mcrypt_enc_self_test)
 PHP_FUNCTION(mcrypt_module_close)
 {
        MCRYPT_GET_TD_ARG
-       zend_list_delete(Z_RES_P(mcryptind));
+       zend_list_close(Z_RES_P(mcryptind));
        RETURN_TRUE;
 }
 /* }}} */

diff --git a/ext/sysvshm/sysvshm.c b/ext/sysvshm/sysvshm.c
index b6e27ffbb1cde5ffb0ae5444fe01c9d58e1518b0..bb908a41131cc8b7d293ae2b53ef4536ffa76fb3 100644 (file)
--- a/ext/sysvshm/sysvshm.c
+++ b/ext/sysvshm/sysvshm.c
@@ -212,7 +212,7 @@ PHP_FUNCTION(shm_detach)
                return;
        }
        SHM_FETCH_RESOURCE(shm_list_ptr, shm_id);
-       RETURN_BOOL(SUCCESS == zend_list_delete(Z_RES_P(shm_id)));
+       RETURN_BOOL(SUCCESS == zend_list_close(Z_RES_P(shm_id)));
 }
 /* }}} */
 

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index f38360380394af69a7f527aad0ae234963dc9ab0..699bad054c4422e446c3c84993d0f42c05583a1b 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -1187,7 +1187,7 @@ PHP_FUNCTION(wddx_packet_end)
 
        RETVAL_STR(STR_COPY(packet->s));
 
-       zend_list_delete(Z_RES_P(packet_id));
+       zend_list_close(Z_RES_P(packet_id));
 }
 /* }}} */