aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-18 00:41:03 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-18 00:41:03 +0100
commit1da2e8a43efbe7dc97b43446972e3c0e50daa37b (patch)
tree9226052d6bded5c98b4afd9496428507f507aad7
parentc619e0e817a304793e17f40a079d2a9864bacfcd (diff)
downloadprosody-1da2e8a43efbe7dc97b43446972e3c0e50daa37b.tar.gz
prosody-1da2e8a43efbe7dc97b43446972e3c0e50daa37b.zip
net.server_select: Don't call onconnect twice for SSL connections
-rw-r--r--net/server_select.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index ca80534c..28f1dc6d 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -243,7 +243,7 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx ) -- t
end
connections = connections + 1
out_put( "server.lua: accepted new client connection from ", tostring(ip), ":", tostring(clientport), " to ", tostring(serverport))
- if dispatch then
+ if dispatch and not sslctx then -- SSL connections will notify onconnect when handshake completes
return dispatch( handler );
end
return;