Software / code / prosody
Changeset
5645:ae079d57af2e
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 05 Jun 2013 21:36:29 +0100 |
| parents | 5641:92ffddd02c96 (current diff) 5644:f9cfe6f5d60f (diff) |
| children | 5646:c4b6ebea7185 |
| files | net/server_select.lua plugins/mod_admin_telnet.lua plugins/mod_bosh.lua |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);
--- 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);
