diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-05-01 13:45:42 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-05-01 13:45:42 +0100 |
| commit | 333918c20296b46b7cd26a54cba1b4c3d51e5862 (patch) | |
| tree | 3e00cd2af58e4602779b13c51761bd86b48ea264 /net | |
| parent | 105c76f9673203559c46666b6d1ee25e059175ba (diff) | |
| parent | 37094685f47c050702a6fc2f9cdd9b6b06dccd90 (diff) | |
| download | prosody-333918c20296b46b7cd26a54cba1b4c3d51e5862.tar.gz prosody-333918c20296b46b7cd26a54cba1b4c3d51e5862.zip | |
Merge 0.9->trunk
Diffstat (limited to 'net')
| -rw-r--r-- | net/server_select.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/server_select.lua b/net/server_select.lua index bdf262ae..7eb330a8 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -149,7 +149,8 @@ _checkinterval = 1200000 -- interval in secs to check idle clients _sendtimeout = 60000 -- allowed send idle time in secs _readtimeout = 6 * 60 * 60 -- allowed read idle time in secs -_maxfd = luasocket._SETSIZE or 1024 -- We should ignore this on Windows. Perhaps by simply setting it to math.huge or something. +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 _maxselectlen = luasocket._SETSIZE or 1024 -- But this still applies on Windows _maxsslhandshake = 30 -- max handshake round-trips |