aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-18 00:41:25 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-18 00:41:25 +0100
commita7771524cb1b8dae8b1d1a58d49f1f00e4b15444 (patch)
tree9226052d6bded5c98b4afd9496428507f507aad7 /net
parente848839db37318dd19ebd15c7c09e857df564ed0 (diff)
parent1da2e8a43efbe7dc97b43446972e3c0e50daa37b (diff)
downloadprosody-a7771524cb1b8dae8b1d1a58d49f1f00e4b15444.tar.gz
prosody-a7771524cb1b8dae8b1d1a58d49f1f00e4b15444.zip
Merge 0.9->trunk
Diffstat (limited to 'net')
-rw-r--r--net/server_select.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index 983b06a2..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;
@@ -551,6 +551,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
handler.readbuffer = _readbuffer -- when handshake is done, replace the handshake function with regular functions
handler.sendbuffer = _sendbuffer
_ = status and status( handler, "ssl-handshake-complete" )
+ if self.autostart_ssl and listeners.onconnect then
+ listeners.onconnect(self);
+ end
_readlistlen = addsocket(_readlist, client, _readlistlen)
return true
else