From 74b39a18a9c5a0a2e7ba9f4075811e7f3524bfdc Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Tue, 27 Feb 2024 23:03:19 +0000
Subject: [PATCH] Revert "Fix GH-13519: PGSQL_CONNECT_FORCE_RENEW with
 persistent connections."

This reverts commit b9a9790be0657249fa5e6687883b43570b0a3f1f.

(cherry picked from commit 330b26e04c12373610bb16472807447f55779a2e)
---
 ext/pgsql/pgsql.c            |  7 -------
 ext/pgsql/tests/gh13519.phpt | 30 ------------------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 ext/pgsql/tests/gh13519.phpt

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 9b2488a5eb8..6e04848bdea 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -562,7 +562,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));
@@ -591,12 +590,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;
 			}
diff --git a/ext/pgsql/tests/gh13519.phpt b/ext/pgsql/tests/gh13519.phpt
deleted file mode 100644
index 17379cdacce..00000000000
--- a/ext/pgsql/tests/gh13519.phpt
+++ /dev/null
@@ -1,30 +0,0 @@
---TEST--
-GH-13519 - PGSQL_CONNECT_FORCE_NEW with persistent connections.
---EXTENSIONS--
-pgsql
---SKIPIF--
-<?php include("skipif.inc"); ?>
---FILE--
-<?php
-include 'config.inc';
-
-$db1 = pg_pconnect($conn_str);
-$pid1 = pg_get_pid($db1);
-for ($i = 0; $i < 3; $i ++) {
-	$db2 = pg_pconnect($conn_str);
-	var_dump($pid1 === pg_get_pid($db2));
-}
-for ($i = 0; $i < 3; $i ++) {
-	$db2 = pg_pconnect($conn_str, PGSQL_CONNECT_FORCE_NEW);
-	var_dump($pid1 === pg_get_pid($db2));
-	pg_close($db2);
-}
-pg_close($db1);
-?>
---EXPECT--
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(false)