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 | a4eb37148c0ef50dee686ec0ab28d1f6e811fdf0 (patch) | |
| tree | 4cf963a78037a15c8c58d330caaea791605c5b09 /net | |
| parent | 3389da653e5eaff6f8c78a7c56323732cfd6abe3 (diff) | |
| parent | 9c877dbe930137f5e4507da798fdd91135e8af9e (diff) | |
| download | prosody-a4eb37148c0ef50dee686ec0ab28d1f6e811fdf0.tar.gz prosody-a4eb37148c0ef50dee686ec0ab28d1f6e811fdf0.zip | |
Merge 0.9->trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/server_select.lua | 2 |
1 files changed, 1 insertions, 1 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 |