diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-18 00:40:09 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-18 00:40:09 +0100 |
| commit | c619e0e817a304793e17f40a079d2a9864bacfcd (patch) | |
| tree | cd8c1abd99ecc85279cea868fdd948620e8175d2 | |
| parent | 6dced9f4823fd0353f3129df56b835cba6e82da6 (diff) | |
| parent | e6c2af23ebe1b57b9d9e5794966dc531fd701412 (diff) | |
| download | prosody-c619e0e817a304793e17f40a079d2a9864bacfcd.tar.gz prosody-c619e0e817a304793e17f40a079d2a9864bacfcd.zip | |
Merge backout
| -rw-r--r-- | net/server_select.lua | 3 |
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 |