From 3841bac4c9b59aa2630e270c79c3c45e36b2816f Mon Sep 17 00:00:00 2001
From: "Stephen R. van den Berg" <srb@cuci.nl>
Date: Thu, 18 Feb 2016 10:49:46 +0100
Subject: [PATCH] pgsql: Do not rethrow MAGICTERMINATE.

---
 lib/modules/Sql.pmod/pgsql.pike | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/modules/Sql.pmod/pgsql.pike b/lib/modules/Sql.pmod/pgsql.pike
index e860ba0cda..49dc9100ac 100644
--- a/lib/modules/Sql.pmod/pgsql.pike
+++ b/lib/modules/Sql.pmod/pgsql.pike
@@ -1162,10 +1162,8 @@ private void procmessage() {
     if(err==MAGICTERMINATE) {	// Announce connection termination to server
       ci->start()->add("X\0\0\0\4")->sendcmd(SENDOUT);
       terminating=1;
-      if(!sizeof(ci))
-        break;
-    }
-    if(stringp(err)) {
+      err=0;
+    } else if(stringp(err)) {
       .pgsql_util.sql_result or;
       if(!objectp(or=portal))
         or=this;
-- 
GitLab