X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fserver_select.lua;h=33c18a606140b316ecc55045104bac1750e683a7;hb=6fa9af28f8aec06efc8f7ee4d1e9598575fb48a2;hp=c5e0772f8a7ff1bc32e255487d817e8f27d7ede2;hpb=26f5fc092e3196959775bbcaef4acf629bb08975;p=prosody.git

diff --git a/net/server_select.lua b/net/server_select.lua
index c5e0772f..33c18a60 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -285,6 +285,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
 	local disconnect = listeners.ondisconnect
 	local drain = listeners.ondrain
 	local onreadtimeout = listeners.onreadtimeout;
+	local detach = listeners.ondetach
 
 	local bufferqueue = { } -- buffer array
 	local bufferqueuelen = 0	-- end of buffer array
@@ -316,11 +317,15 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
 	handler.onreadtimeout = onreadtimeout;
 
 	handler.setlistener = function( self, listeners )
+		if detach then
+			detach(self) -- Notify listener that it is no longer responsible for this connection
+		end
 		dispatch = listeners.onincoming
 		disconnect = listeners.ondisconnect
 		status = listeners.onstatus
 		drain = listeners.ondrain
 		handler.onreadtimeout = listeners.onreadtimeout
+		detach = listeners.ondetach
 	end
 	handler.getstats = function( )
 		return readtraffic, sendtraffic
@@ -401,6 +406,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
 	handler.clientport = function( )
 		return clientport
 	end
+	handler.port = handler.clientport -- COMPAT server_event
 	local write = function( self, data )
 		bufferlen = bufferlen + #data
 		if bufferlen > maxsendlen then
@@ -562,6 +568,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
 						_ = status and status( handler, "ssl-handshake-complete" )
 						if self.autostart_ssl and listeners.onconnect then
 							listeners.onconnect(self);
+							if bufferqueuelen ~= 0 then
+								_sendlistlen = addsocket(_sendlist, client, _sendlistlen)
+							end
 						end
 						_readlistlen = addsocket(_readlist, client, _readlistlen)
 						return true
@@ -708,6 +717,7 @@ local function link(sender, receiver, buffersize)
 			sender:lock_read(true);
 		end
 	end
+	sender:set_mode("*a");
 end
 
 ----------------------------------// PUBLIC //--