From: Matthew Wild <mwild1@gmail.com>
Date: Sat, 2 Jan 2016 20:42:53 +0000 (+0000)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=f72dc3773f3ad68c025710eb2b6b68b95bdbc4e3;p=prosody.git

Merge 0.10->trunk
---

f72dc3773f3ad68c025710eb2b6b68b95bdbc4e3
diff --cc net/server_select.lua
index 35dcb5a7,87921df4..ced73074
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@@ -932,8 -894,24 +932,9 @@@ loop = function(once) -- this is the ma
  				end
  			end
  		end
 -
 -		-- Fire timers
 -		if _currenttime - _timer >= math_min(next_timer_time, 1) then
 -			next_timer_time = math_huge;
 -			for i = 1, _timerlistlen do
 -				local t = _timerlist[ i ]( _currenttime ) -- fire timers
 -				if t then next_timer_time = math_min(next_timer_time, t); end
 -			end
 -			_timer = _currenttime
 -		else
 -			next_timer_time = next_timer_time - (_currenttime - _timer);
 -		end
 -
 -		-- wait some time (0 by default)
 -		socket_sleep( _sleeptime )
  	until quitting;
  	if once and quitting == "once" then quitting = nil; return; end
+ 	closeall();
  	return "quitting"
  end