From c9e07b3da388fde72b428c7f43db61f4753415f8 Mon Sep 17 00:00:00 2001
From: "Stephen R. van den Berg" <srb@cuci.nl>
Date: Thu, 9 Nov 2017 03:09:19 +0100
Subject: [PATCH] pgsql: Signal EOF first, to avoid deadlock on object
destruction.
---
lib/modules/Sql.pmod/pgsql_util.pmod | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/modules/Sql.pmod/pgsql_util.pmod b/lib/modules/Sql.pmod/pgsql_util.pmod
index d45db8cb0d..725c9afc06 100644
--- a/lib/modules/Sql.pmod/pgsql_util.pmod
+++ b/lib/modules/Sql.pmod/pgsql_util.pmod
@@ -1186,11 +1186,11 @@ class sql_result {
if(statusccomplete && !statuscmdcomplete)
statuscmdcomplete=statusccomplete;
inflight=0;
+ datarows->write(1); // Signal EOF
conxsess plugbuffer;
if (!catch(plugbuffer = c->start()))
plugbuffer->sendcmd(_closeportal(plugbuffer));
_state=CLOSED;
- datarows->write(1); // Signal EOF
releaseconditions();
}
--
GitLab