From 49e330ab5c8021410c61b8ea4e618cc765e87552 Mon Sep 17 00:00:00 2001
From: "Stephen R. van den Berg" <srb@cuci.nl>
Date: Thu, 9 Nov 2017 23:45:05 +0100
Subject: [PATCH] Revert "pgsql: Signal EOF first, to avoid deadlock on object
destruction."
This reverts commit f342376c815d0f060e69fb3aba761e817c9583a1.
The race has instead been fixed correctly by:
pgsql: Cater for race during asynchronous destruction of bufcon.
---
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 6d92a1df55..de8032dbe5 100644
--- a/lib/modules/Sql.pmod/pgsql_util.pmod
+++ b/lib/modules/Sql.pmod/pgsql_util.pmod
@@ -1206,11 +1206,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