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 | 9efbc37801652c0ce3b0a876b8b8762d84b99179 (patch) | |
| tree | cd8c1abd99ecc85279cea868fdd948620e8175d2 | |
| parent | fc2f7c817af24bcb2c1d978120f81825b2d986a2 (diff) | |
| parent | bad45a4ad41914b066408fcc06ece6a4a8048edc (diff) | |
| download | prosody-9efbc37801652c0ce3b0a876b8b8762d84b99179.tar.gz prosody-9efbc37801652c0ce3b0a876b8b8762d84b99179.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 |