mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.3'
This commit is contained in:
@@ -560,7 +560,6 @@ static void php_pgsql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
|
||||
|
||||
/* try to find if we already have this link in our persistent list */
|
||||
if ((le = zend_hash_find_ptr(&EG(persistent_list), str.s)) == NULL) { /* we don't */
|
||||
newpconn:
|
||||
if (PGG(max_links) != -1 && PGG(num_links) >= PGG(max_links)) {
|
||||
php_error_docref(NULL, E_WARNING,
|
||||
"Cannot create new link. Too many open links (" ZEND_LONG_FMT ")", PGG(num_links));
|
||||
@@ -589,12 +588,6 @@ newpconn:
|
||||
PGG(num_links)++;
|
||||
PGG(num_persistent)++;
|
||||
} else { /* we do */
|
||||
if ((connect_type & PGSQL_CONNECT_FORCE_NEW)) {
|
||||
if (zend_hash_del(&EG(persistent_list), str.s) != SUCCESS) {
|
||||
goto err;
|
||||
}
|
||||
goto newpconn;
|
||||
}
|
||||
if (le->type != le_plink) {
|
||||
goto err;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user