From 6ff53f7348b7d38baa583b45d69dffae3ca4b140 Mon Sep 17 00:00:00 2001
From: "Stephen R. van den Berg" <srb@cuci.nl>
Date: Mon, 7 Nov 2016 14:06:51 +0100
Subject: [PATCH] pgsql: Revert portal purge change, race condition was
 elsewhere.

---
 lib/modules/Sql.pmod/pgsql.pike | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/modules/Sql.pmod/pgsql.pike b/lib/modules/Sql.pmod/pgsql.pike
index 866e6a0408..ee77ad8187 100644
--- a/lib/modules/Sql.pmod/pgsql.pike
+++ b/lib/modules/Sql.pmod/pgsql.pike
@@ -1178,14 +1178,13 @@ private void procmessage() {
   }
   PD("Closing database processloop %O\n",err);
   _delayederror=err;
-  do
+  for(; objectp(portal); portal = qportals->read())
     if(objectp(portal)) {
 #ifdef PG_DEBUG
       showportal(0);
 #endif
       portal->_purgeportal();
     }
-  while (objectp(portal = qportals->read()));
   if(!terminating && _options.reconnect)
     _connectfail();
   else
-- 
GitLab