Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit b0737fa35e3a · 2019-12-20T12:06:05.000+01:00
* PHP-7.3:
  Fix #78982: pdo_pgsql returns dead persistent connection
diff --git a/NEWS b/NEWS
@@ -34,6 +34,8 @@ PHP                                                                        NEWS
     Kentarō)
   . Fixed bug #78980 (pgsqlGetNotify() overlooks dead connection). (SATŌ
     Kentarō)
+  . Fixed bug #78982 (pdo_pgsql returns dead persistent connection). (SATŌ
+    Kentarō)
 
 - Spl:
   . Fixed bug #78976 (SplFileObject::fputcsv returns -1 on failure). (cmb)
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
@@ -473,7 +473,7 @@ static int pdo_pgsql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
 static int pdo_pgsql_check_liveness(pdo_dbh_t *dbh)
 {
 	pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;
-	if (PQstatus(H->server) == CONNECTION_BAD) {
+	if (!PQconsumeInput(H->server) || PQstatus(H->server) == CONNECTION_BAD) {
 		PQreset(H->server);
 	}
 	return (PQstatus(H->server) == CONNECTION_OK) ? SUCCESS : FAILURE;

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ static int pdo_pgsql_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_`
`473`	`473`	`static int pdo_pgsql_check_liveness(pdo_dbh_t *dbh)`
`474`	`474`	`{`
`475`	`475`	`pdo_pgsql_db_handle H = (pdo_pgsql_db_handle )dbh->driver_data;`
`476`		`- if (PQstatus(H->server) == CONNECTION_BAD) {`
	`476`	`+ if (!PQconsumeInput(H->server) \|\| PQstatus(H->server) == CONNECTION_BAD) {`
`477`	`477`	`PQreset(H->server);`
`478`	`478`	`}`
`479`	`479`	`return (PQstatus(H->server) == CONNECTION_OK) ? SUCCESS : FAILURE;`