From 10338aeb7f5b87daa50b3ccc5b3fd13f678a1442 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Sun, 2 Jun 2013 16:23:19 -0400 Subject: net.server_select: Ensure _maxfd = math.huge on Windows, always. --- net/server_select.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/server_select.lua b/net/server_select.lua index 7eb330a8..a6e91d0b 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -150,7 +150,7 @@ _sendtimeout = 60000 -- allowed send idle time in secs _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 -- cgit v1.2.3 From 6b543a641650cf643cbc18f087965e6841935b4a Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 4 Jun 2013 19:35:41 +0200 Subject: mod_admin_telnet: Fix inverted boolean logic --- plugins/mod_admin_telnet.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua index d8dd9951..5264c21b 100644 --- a/plugins/mod_admin_telnet.lua +++ b/plugins/mod_admin_telnet.lua @@ -958,7 +958,7 @@ function def_env.user:delete(jid) 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); -- cgit v1.2.3 From 83eae5c866527d2b2490eb134df456e393401457 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Wed, 5 Jun 2013 21:35:50 +0100 Subject: mod_bosh: Reset creating_session to prevent putting unnecessary attributes into every BOSH response --- plugins/mod_bosh.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index 184da321..8c084c95 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -284,6 +284,7 @@ function stream_callbacks.streamopened(context, attr) 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); -- cgit v1.2.3