Software /
code /
prosody
Diff
net/server_event.lua @ 7042:20ac6972b9aa
Merge 0.10->trunk
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Sat, 02 Jan 2016 20:42:53 +0000 |
parent | 6929:03bc9e197fcc |
parent | 7040:bdcea2dd33b8 |
child | 7225:a74f0b7be6bf |
line wrap: on
line diff
--- a/net/server_event.lua Fri Jan 01 23:31:13 2016 +0100 +++ b/net/server_event.lua Sat Jan 02 20:42:53 2016 +0000 @@ -614,6 +614,7 @@ local interface = { _connections = 0; + type = "server"; conn = server; onconnect = listener.onconnect; -- will be called when new client connected eventread = false; -- read event handler