--- a/net/server_epoll.lua	Wed Aug 10 20:55:31 2016 +0200
+++ b/net/server_epoll.lua	Wed Aug 10 20:57:05 2016 +0200
@@ -424,12 +424,6 @@
 	self.listeners.onconnect(self);
 end
 
-local function addclient(addr, port, listeners, pattern, tls)
-	local conn, err = socket.connect(addr, port);
-	if not conn then return conn, err; end
-	return wrapsocket(conn, nil, pattern, listeners, tls);
-end
-
 local function addserver(addr, port, listeners, pattern, tls)
 	local conn, err = socket.bind(addr, port, cfg.tcp_backlog);
 	if not conn then return conn, err; end
@@ -466,6 +460,20 @@
 	return client;
 end
 
+local function addclient(addr, port, listeners, pattern, tls)
+	local conn, err = socket.connect(addr, port);
+	if not conn then return conn, err; end
+	conn:settimeout(0);
+	local client = wrapclient(conn, addr, port, listeners, pattern, tls);
+	if tls then
+		client._tls = false;
+		client:starttls();
+	else
+		client:setflags(true, true);
+	end
+	return client;
+end
+
 local function link(from, to)
 	from.listeners = setmetatable({
 		onincoming = function (_, data)