aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-01 13:45:42 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-01 13:45:42 +0100
commit1bf9350814aea431d58dce6942ce9a744740e621 (patch)
tree3e00cd2af58e4602779b13c51761bd86b48ea264 /net
parent201ccbe3b55104da18c030c22b1b8f897fa13710 (diff)
parentf10d012d24cf65e24ba0ff176b56613f4ae4f532 (diff)
downloadprosody-1bf9350814aea431d58dce6942ce9a744740e621.tar.gz
prosody-1bf9350814aea431d58dce6942ce9a744740e621.zip
Merge 0.9->trunk
Diffstat (limited to 'net')
-rw-r--r--net/server_select.lua3
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