# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1370790195 -7200
# Node ID 4f499eb63c045804e917cd44ef0fd6164e92f82f
# Parent  685d46ec352be47d31be50ced97d51087f2b36a3# Parent  4e51ceee469c9911a4838f9e4bb995c1aceaaeaf
Merge 0.9->trunk

diff -r 685d46ec352b -r 4f499eb63c04 net/server_select.lua
--- a/net/server_select.lua	Sun Jun 09 12:59:23 2013 +0200
+++ b/net/server_select.lua	Sun Jun 09 17:03:15 2013 +0200
@@ -263,7 +263,9 @@
 	if socket:getfd() >= _maxfd then
 		out_error("server.lua: Disallowed FD number: "..socket:getfd()) -- PROTIP: Switch to libevent
 		socket:close( ) -- Should we send some kind of error here?
-		server.pause( )
+		if server then
+			server.pause( )
+		end
 		return nil, nil, "fd-too-large"
 	end
 	socket:settimeout( 0 )