From: Steven Barth <steven@midlink.org>
Date: Fri, 6 Mar 2009 16:34:26 +0000 (+0000)
Subject: nixio util:
X-Git-Tag: 0.9.0~626
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=09a18c2c31bcfe903ff3ede9654f6e351355f75e

nixio util:
Don't shutdown TLS connection on close()
This could lead to problems when calling close on a forked socket
sink() also shutdown connection if close is requested and possible
---

diff --git a/libs/nixio/lua/nixio/util.lua b/libs/nixio/lua/nixio/util.lua
index f2ee2a27e..59bdce8f4 100644
--- a/libs/nixio/lua/nixio/util.lua
+++ b/libs/nixio/lua/nixio/util.lua
@@ -151,6 +151,9 @@ end
 function meta.sink(self, close)
 	return function(chunk, src_err)
 		if not chunk and not src_err and close then
+			if self.shutdown then
+				self:shutdown()
+			end
 			self:close()
 		elseif chunk and #chunk > 0 then
 			return self:writeall(chunk)
@@ -160,7 +163,6 @@ function meta.sink(self, close)
 end
 
 function tls_socket.close(self)
-	self:shutdown()
 	return self.socket:close()
 end