# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1370464589 -3600
# Node ID ae079d57af2e78fd25f6183d7d647fc15d0429bf
# Parent  92ffddd02c96381c9a9b1049a625c16fe7500093# Parent  f9cfe6f5d60f8c9347828d27286a4c0e6942d321
Merge 0.9->trunk

diff -r 92ffddd02c96 -r ae079d57af2e net/server_select.lua
--- a/net/server_select.lua	Mon Jun 03 12:50:37 2013 -0400
+++ b/net/server_select.lua	Wed Jun 05 21:36:29 2013 +0100
@@ -150,7 +150,7 @@
 _readtimeout = 6 * 60 * 60 -- allowed read idle time in secs
 
 local is_windows = package.config:sub(1,1) == "\\" -- check the directory separator, to detemine whether this is Windows
-_maxfd = luasocket._SETSIZE or (is_windows and math.huge) or 1024 -- max fd number, limit to 1024 by default to prevent glibc buffer overflow, but not on Windows
+_maxfd = (is_windows and math.huge) or luasocket._SETSIZE or 1024 -- max fd number, limit to 1024 by default to prevent glibc buffer overflow, but not on Windows
 _maxselectlen = luasocket._SETSIZE or 1024 -- But this still applies on Windows
 
 _maxsslhandshake = 30 -- max handshake round-trips
diff -r 92ffddd02c96 -r ae079d57af2e plugins/mod_admin_telnet.lua
--- a/plugins/mod_admin_telnet.lua	Mon Jun 03 12:50:37 2013 -0400
+++ b/plugins/mod_admin_telnet.lua	Wed Jun 05 21:36:29 2013 +0100
@@ -976,7 +976,7 @@
 	local username, host = jid_split(jid);
 	if not hosts[host] then
 		return nil, "No such host: "..host;
-	elseif um.user_exists(username, host) then
+	elseif not um.user_exists(username, host) then
 		return nil, "No such user";
 	end
 	local ok, err = um.delete_user(username, host);
diff -r 92ffddd02c96 -r ae079d57af2e plugins/mod_bosh.lua
--- a/plugins/mod_bosh.lua	Mon Jun 03 12:50:37 2013 -0400
+++ b/plugins/mod_bosh.lua	Wed Jun 05 21:36:29 2013 +0100
@@ -284,6 +284,7 @@
 					sid = sid;
 				};
 				if creating_session then
+					creating_session = nil;
 					body_attr.inactivity = tostring(BOSH_DEFAULT_INACTIVITY);
 					body_attr.polling = tostring(BOSH_DEFAULT_POLLING);
 					body_attr.requests = tostring(BOSH_DEFAULT_REQUESTS);