Bug #45888 (Refcounting in ZTS mode)

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 3ab7eb9afe786638e8cb270230804e66feeb12c6..b4bb12739391d69b2c4adcd4774a92f0653cbfda 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -1143,7 +1143,7 @@ PHP_RSHUTDOWN_FUNCTION(oci)
 #ifdef ZTS
        zend_hash_apply_with_argument(&EG(regular_list), (apply_func_arg_t) php_oci_list_helper, (void *)le_descriptor TSRMLS_CC);
        zend_hash_apply_with_argument(&EG(regular_list), (apply_func_arg_t) php_oci_list_helper, (void *)le_collection TSRMLS_CC);
-       while (OCI_G(num_statements)) {
+       while (OCI_G(num_statements) > 0) {
                zend_hash_apply_with_argument(&EG(regular_list), (apply_func_arg_t) php_oci_list_helper, (void *)le_statement TSRMLS_CC);
        }
 #endif
@@ -1155,7 +1155,9 @@ PHP_RSHUTDOWN_FUNCTION(oci)
        zend_hash_apply(&EG(persistent_list), (apply_func_t) php_oci_persistent_helper TSRMLS_CC);
 
 #ifdef ZTS
-       zend_hash_apply_with_argument(&EG(regular_list), (apply_func_arg_t) php_oci_list_helper, (void *)le_connection TSRMLS_CC);
+       while (OCI_G(num_links) > OCI_G(num_persistent)) {
+               zend_hash_apply_with_argument(&EG(regular_list), (apply_func_arg_t) php_oci_list_helper, (void *)le_connection TSRMLS_CC);
+       }
        php_oci_cleanup_global_handles(TSRMLS_C);
 #endif
 
@@ -1227,6 +1229,7 @@ static void php_oci_pconnection_list_dtor(zend_rsrc_list_entry *entry TSRMLS_DC)
        if (connection) {
                php_oci_connection_close(connection TSRMLS_CC);
                OCI_G(num_persistent)--;
+               OCI_G(num_links)--;
        }
 } /* }}} */
 
@@ -1870,11 +1873,11 @@ php_oci_connection *php_oci_do_connect_ex(zstr username, int username_len, zstr
        if (persistent) {
                zend_bool alloc_non_persistent = 0;
 
-               if (OCI_G(max_persistent)!=-1 && OCI_G(num_persistent)>=OCI_G(max_persistent)) {
+               if (OCI_G(max_persistent) != -1 && OCI_G(num_persistent) >= OCI_G(max_persistent)) {
                        /* try to find an idle connection and kill it */
                        zend_hash_apply(&EG(persistent_list), (apply_func_t) php_oci_persistent_helper TSRMLS_CC);
 
-                       if (OCI_G(max_persistent)!=-1 && OCI_G(num_persistent)>=OCI_G(max_persistent)) {
+                       if (OCI_G(max_persistent) != -1 && OCI_G(num_persistent) >= OCI_G(max_persistent)) {
                                /* all persistent connactions are in use, fallback to non-persistent connection creation */
                                php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Too many open persistent connections (%ld)", OCI_G(num_persistent));
                                alloc_non_persistent = 1;
@@ -1964,6 +1967,7 @@ php_oci_connection *php_oci_do_connect_ex(zstr username, int username_len, zstr
                }
                zend_hash_update(&EG(persistent_list), connection->hash_key, connection->hash_key_len+1, (void *)&new_le, sizeof(zend_rsrc_list_entry), NULL);
                OCI_G(num_persistent)++;
+               OCI_G(num_links)++;
        } else if (!exclusive) {
                connection->rsrc_id = zend_list_insert(connection, le_connection);
                new_le.ptr = (void *)connection->rsrc_id;