Software / code / prosody
Diff
net/server_select.lua @ 5645:ae079d57af2e
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 05 Jun 2013 21:36:29 +0100 |
| parent | 5633:d999027577ed |
| parent | 5642:5862bb57a3f1 |
| child | 5664:4f499eb63c04 |
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
