aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-18 00:40:09 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-18 00:40:09 +0100
commit0345565022f1526837d749a4768e43b5d532c77c (patch)
treecd8c1abd99ecc85279cea868fdd948620e8175d2 /net
parent5fea8c600e8382a58995f48936d5b61f64a79712 (diff)
parentbad45a4ad41914b066408fcc06ece6a4a8048edc (diff)
downloadprosody-0345565022f1526837d749a4768e43b5d532c77c.tar.gz
prosody-0345565022f1526837d749a4768e43b5d532c77c.zip
Merge backout
Diffstat (limited to 'net')
-rw-r--r--net/server_select.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index 983b06a2..ca80534c 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -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