diff options
| author | Kim Alvefur <zash@zash.se> | 2014-09-28 01:56:22 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-09-28 01:56:22 +0200 |
| commit | dfd54e1aed80944b32680f9195bb1494a3469531 (patch) | |
| tree | cfaf4c445383819dc32ada72c88e3f18079d9b30 /net | |
| parent | bc2dc17d56a1a6f35177469c7122dfe577c3bf2c (diff) | |
| parent | 55bacaf74f778f267bcf1f01c5c11caaa31ac671 (diff) | |
| download | prosody-dfd54e1aed80944b32680f9195bb1494a3469531.tar.gz prosody-dfd54e1aed80944b32680f9195bb1494a3469531.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
| -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 9b8e41d9..b9785678 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -569,6 +569,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport _ = status and status( handler, "ssl-handshake-complete" ) if self.autostart_ssl and listeners.onconnect then listeners.onconnect(self); + if bufferqueuelen ~= 0 then + _sendlistlen = addsocket(_sendlist, client, _sendlistlen) + end end _readlistlen = addsocket(_readlist, client, _readlistlen) return true |