diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-06-05 21:36:29 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-06-05 21:36:29 +0100 |
| commit | 335cb1d50735446322d86db147980ca98d9e1060 (patch) | |
| tree | 4cf963a78037a15c8c58d330caaea791605c5b09 | |
| parent | 262580f590cc4f77a925ca813067f88084146052 (diff) | |
| parent | 83eae5c866527d2b2490eb134df456e393401457 (diff) | |
| download | prosody-335cb1d50735446322d86db147980ca98d9e1060.tar.gz prosody-335cb1d50735446322d86db147980ca98d9e1060.zip | |
Merge 0.9->trunk
| -rw-r--r-- | net/server_select.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_admin_telnet.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_bosh.lua | 1 |
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); |