diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-20 12:05:39 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-12-20 12:06:05 +0100 |
| commit | b0737fa35e3a8dec495a8faf39887f1a587307d8 (patch) | |
| tree | 80a444b7e839088a9a29c4ed2b4a79d7c93678dc /ext/pdo_pgsql/pgsql_driver.c | |
| parent | f974f252ddf47da1294a813ffb60e82f3638186c (diff) | |
| parent | 37d11d123e4b8952bf973e372c4062f6d0a7bca8 (diff) | |
| download | php-git-b0737fa35e3a8dec495a8faf39887f1a587307d8.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78982: pdo_pgsql returns dead persistent connection
Diffstat (limited to 'ext/pdo_pgsql/pgsql_driver.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_pgsql/pgsql_driver.c b/ext/pdo_pgsql/pgsql_driver.c index a32d52c6a4..b6f008071c 100644 --- 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; |