# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1451767373 0
# Node ID 20ac6972b9aab837972813e40a93b2cac6deadc5
# Parent  22f36a3d636919dbfe4e65d9b5ca78b9b314d5c5# Parent  aff786e7b4ceea89be9fdf3fa57119541f007815
Merge 0.10->trunk

diff -r 22f36a3d6369 -r 20ac6972b9aa net/server_event.lua
--- 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
diff -r 22f36a3d6369 -r 20ac6972b9aa net/server_select.lua
--- a/net/server_select.lua	Fri Jan 01 23:31:13 2016 +0100
+++ b/net/server_select.lua	Sat Jan 02 20:42:53 2016 +0000
@@ -934,6 +934,7 @@
 		end
 	until quitting;
 	if once and quitting == "once" then quitting = nil; return; end
+	closeall();
 	return "quitting"
 end
 
diff -r 22f36a3d6369 -r 20ac6972b9aa util/events.lua
--- a/util/events.lua	Fri Jan 01 23:31:13 2016 +0100
+++ b/util/events.lua	Sat Jan 02 20:42:53 2016 +0000
@@ -17,10 +17,15 @@
 local _ENV = nil;
 
 local function new()
+	-- Map event name to ordered list of handlers (lazily built): handlers[event_name] = array_of_handler_functions
 	local handlers = {};
+	-- Array of wrapper functions that wrap all events (nil if empty)
 	local global_wrappers;
+	-- Per-event wrappers: wrappers[event_name] = wrapper_function
 	local wrappers = {};
+	-- Event map: event_map[handler_function] = priority_number
 	local event_map = {};
+	-- Called on-demand to build handlers entries
 	local function _rebuild_index(handlers, event)
 		local _handlers = event_map[event];
 		if not _handlers or next(_handlers) == nil then return; end