aboutsummaryrefslogtreecommitdiffstats
path: root/net/server_select.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-04-17 19:11:57 +0200
committerKim Alvefur <zash@zash.se>2013-04-17 19:11:57 +0200
commit08eceec2bf30cec73020e3926f7dd2fca5aba3ab (patch)
treebbb6068989d701249c75d0626778b76d2343ef54 /net/server_select.lua
parentb41b25c119c4e4676865ab3748e67a07cd41af71 (diff)
parent012519b6ad7e4a8487b5bb143c081a4e0600a65b (diff)
downloadprosody-08eceec2bf30cec73020e3926f7dd2fca5aba3ab.tar.gz
prosody-08eceec2bf30cec73020e3926f7dd2fca5aba3ab.zip
Merge 0.9->trunk
Diffstat (limited to 'net/server_select.lua')
-rw-r--r--net/server_select.lua3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index 8ce9eed2..f123f4b7 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -551,9 +551,6 @@ 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