Software / code / prosody
Changeset
5493:307c4b1259b3
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 18 Apr 2013 00:41:25 +0100 |
| parents | 5489:421c7830eccc (current diff) 5492:5d0cc5de5c51 (diff) |
| children | 5495:d5b07342fccf |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server_select.lua Thu Apr 18 00:10:52 2013 +0100 +++ b/net/server_select.lua Thu Apr 18 00:41:25 2013 +0100 @@ -243,7 +243,7 @@ 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 @@ 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
