projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 0.10->trunk
[prosody.git]
/
net
/
server_event.lua
diff --git
a/net/server_event.lua
b/net/server_event.lua
index 9b1ffb2584288968b49a6b0a41db256ba008ada9..677586645fd233b010ce82f66a169082d0a0ac86 100644
(file)
--- a/
net/server_event.lua
+++ b/
net/server_event.lua
@@
-614,6
+614,7
@@
local function handleserver( server, addr, port, pattern, listener, sslctx ) --
local interface = {
_connections = 0;
+ type = "server";
conn = server;
onconnect = listener.onconnect; -- will be called when new client connected
eventread = false; -- read event handler