Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 04 Jan 2017 13:18:06 +0100
changeset 7813 cdb5dd9f35c0
parent 7811 0494bf73dfee (current diff)
parent 7812 34ca48325ce7 (diff)
child 7814 24f99d11b792
Merge 0.10->trunk
net/server_event.lua
--- a/net/server_event.lua	Wed Jan 04 10:53:16 2017 +0100
+++ b/net/server_event.lua	Wed Jan 04 13:18:06 2017 +0100
@@ -417,6 +417,7 @@
 	self.onreadtimeout = listener.onreadtimeout;
 	self.onstatus = listener.onstatus;
 	self.ondetach = listener.ondetach;
+	self.ondrain = listener.ondrain;
 end
 
 -- Stub handlers