From 12c2fafa865a039d7944844eff72c4255d44045f Mon Sep 17 00:00:00 2001
From: Daniele Varrazzo <daniele.varrazzo@gmail.com>
Date: Sat, 5 Apr 2014 15:32:16 +0100
Subject: [PATCH] Close the connection if discovered bad on poll()

---
 NEWS             |  1 +
 psycopg/pqpath.c | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/NEWS b/NEWS
index 4e63e0fd..99419bf6 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ What's new in psycopg 2.5.3
   the superclass init (:ticket:`#195`).
 - Mark the connection closed when a Socket connection is broken, as it
   happens for TCP connections instead (:ticket:`#196`).
+- Mark the connection closed if found broken on `poll()`.
 - It is now possible to call `get_transaction_status()` on closed connections.
 - Fixed debug build on Windows, thanks to James Emerton.
 
diff --git a/psycopg/pqpath.c b/psycopg/pqpath.c
index d33915c8..5cdb38dc 100644
--- a/psycopg/pqpath.c
+++ b/psycopg/pqpath.c
@@ -807,6 +807,12 @@ pq_is_busy(connectionObject *conn)
         Dprintf("pq_is_busy: PQconsumeInput() failed");
         pthread_mutex_unlock(&(conn->lock));
         Py_BLOCK_THREADS;
+
+        /* if the libpq says pgconn is lost, close the py conn */
+        if (CONNECTION_BAD == PQstatus(conn->pgconn)) {
+            conn->closed = 2;
+        }
+
         PyErr_SetString(OperationalError, PQerrorMessage(conn->pgconn));
         return -1;
     }
@@ -836,6 +842,12 @@ pq_is_busy_locked(connectionObject *conn)
 
     if (PQconsumeInput(conn->pgconn) == 0) {
         Dprintf("pq_is_busy_locked: PQconsumeInput() failed");
+
+        /* if the libpq says pgconn is lost, close the py conn */
+        if (CONNECTION_BAD == PQstatus(conn->pgconn)) {
+            conn->closed = 2;
+        }
+
         PyErr_SetString(OperationalError, PQerrorMessage(conn->pgconn));
         return -1;
     }