aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-05 21:36:29 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-05 21:36:29 +0100
commita4eb37148c0ef50dee686ec0ab28d1f6e811fdf0 (patch)
tree4cf963a78037a15c8c58d330caaea791605c5b09
parent3389da653e5eaff6f8c78a7c56323732cfd6abe3 (diff)
parent9c877dbe930137f5e4507da798fdd91135e8af9e (diff)
downloadprosody-a4eb37148c0ef50dee686ec0ab28d1f6e811fdf0.tar.gz
prosody-a4eb37148c0ef50dee686ec0ab28d1f6e811fdf0.zip
Merge 0.9->trunk
-rw-r--r--net/server_select.lua2
-rw-r--r--plugins/mod_admin_telnet.lua2
-rw-r--r--plugins/mod_bosh.lua1
3 files changed, 3 insertions, 2 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index 1665524f..4d0f3f94 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
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 3b8fedbd..ae8ca530 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -976,7 +976,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);
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 0a331f27..03355564 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);