Fix #78982: pdo_pgsql returns dead persistent connection

ranvis · nikic · commit 37d11d123e4b · 2019-12-20T12:05:17.000+01:00
Call PQconsumeInput() before PQstatus() to update the status.
diff --git a/NEWS b/NEWS
@@ -26,6 +26,8 @@ PHP                                                                        NEWS
     Kentarō)
   . Fixed bug #78980 (pgsqlGetNotify() overlooks dead connection). (SATŌ
     Kentarō)
+  . Fixed bug #78982 (pdo_pgsql returns dead persistent connection). (SATŌ
+    Kentarō)
 
 18 Dec 2019, PHP 7.3.13
 
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
@@ -479,7 +479,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
`@@ -479,7 +479,7 @@ static int pdo_pgsql_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_`
`479`	`479`	`static int pdo_pgsql_check_liveness(pdo_dbh_t *dbh)`
`480`	`480`	`{`
`481`	`481`	`pdo_pgsql_db_handle H = (pdo_pgsql_db_handle )dbh->driver_data;`
`482`		`- if (PQstatus(H->server) == CONNECTION_BAD) {`
	`482`	`+ if (!PQconsumeInput(H->server) \|\| PQstatus(H->server) == CONNECTION_BAD) {`
`483`	`483`	`PQreset(H->server);`
`484`	`484`	`}`
`485`	`485`	`return (PQstatus(H->server) == CONNECTION_OK) ? SUCCESS : FAILURE;`