Diff

net/server_select.lua @ 6442:0f4025abbe8f

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sun, 28 Sep 2014 01:56:22 +0200
parent 6383:ec8878113907
parent 6433:b93402cec1c4
child 6465:ab68bb837fe0
line wrap: on
line diff
--- a/net/server_select.lua	Sat Sep 27 19:00:09 2014 +0200
+++ b/net/server_select.lua	Sun Sep 28 01:56:22 2014 +0200
@@ -569,6 +569,9 @@
 						_ = 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