Merge branch 'PHP-7.4'

nikic · nikic · commit ed372541dae3 · 2019-12-20T12:06:24.000+01:00
* PHP-7.4:
  Fix #78982: pdo_pgsql returns dead persistent connection
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c
@@ -471,7 +471,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
`@@ -471,7 +471,7 @@ static int pdo_pgsql_get_attribute(pdo_dbh_t dbh, zend_long attr, zval return_`
`471`	`471`	`static int pdo_pgsql_check_liveness(pdo_dbh_t *dbh)`
`472`	`472`	`{`
`473`	`473`	`pdo_pgsql_db_handle H = (pdo_pgsql_db_handle )dbh->driver_data;`
`474`		`- if (PQstatus(H->server) == CONNECTION_BAD) {`
	`474`	`+ if (!PQconsumeInput(H->server) \|\| PQstatus(H->server) == CONNECTION_BAD) {`
`475`	`475`	`PQreset(H->server);`
`476`	`476`	`}`
`477`	`477`	`return (PQstatus(H->server) == CONNECTION_OK) ? SUCCESS : FAILURE;`