diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-01-02 20:42:53 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-01-02 20:42:53 +0000 |
| commit | 8525a177737252f17ef63a09047b9bbac7f61282 (patch) | |
| tree | cb3e8bce329accde5bcfa6c8138f4868a7aa9c58 /net | |
| parent | 93408770ef53ce0056d7a875f79b053f218eb806 (diff) | |
| parent | 1eb8d252ea82a641caaf4996d1a9c31f62db83a2 (diff) | |
| download | prosody-8525a177737252f17ef63a09047b9bbac7f61282.tar.gz prosody-8525a177737252f17ef63a09047b9bbac7f61282.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/server_event.lua | 1 | ||||
| -rw-r--r-- | net/server_select.lua | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/server_event.lua b/net/server_event.lua index 9b1ffb25..67758664 100644 --- 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 diff --git a/net/server_select.lua b/net/server_select.lua index 35dcb5a7..ced73074 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -934,6 +934,7 @@ loop = function(once) -- this is the main loop of the program end until quitting; if once and quitting == "once" then quitting = nil; return; end + closeall(); return "quitting" end |