aboutsummaryrefslogtreecommitdiffstats
path: root/net/server_select.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-11-29 07:16:45 +0500
committerMatthew Wild <mwild1@gmail.com>2012-11-29 07:16:45 +0500
commite75174bad1ad572da588bbddd452369c422054ec (patch)
tree946f436f1268fd970de15a3d8ef7d11a38fff245 /net/server_select.lua
parent97123dfead3682296982ba4ff194c46e415165d1 (diff)
parentd7b707744de72882f42d0b688f9ecfd7f9fe3f12 (diff)
downloadprosody-e75174bad1ad572da588bbddd452369c422054ec.tar.gz
prosody-e75174bad1ad572da588bbddd452369c422054ec.zip
Merge 0.9->trunk
Diffstat (limited to 'net/server_select.lua')
-rw-r--r--net/server_select.lua20
1 files changed, 10 insertions, 10 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index 9104dace..8cb4e235 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -749,16 +749,16 @@ changesettings = function( new )
if type( new ) ~= "table" then
return nil, "invalid settings table"
end
- _selecttimeout = tonumber( new.timeout ) or _selecttimeout
- _sleeptime = tonumber( new.sleeptime ) or _sleeptime
- _maxsendlen = tonumber( new.maxsendlen ) or _maxsendlen
- _maxreadlen = tonumber( new.maxreadlen ) or _maxreadlen
- _checkinterval = tonumber( new.checkinterval ) or _checkinterval
- _sendtimeout = tonumber( new.sendtimeout ) or _sendtimeout
- _readtimeout = tonumber( new.readtimeout ) or _readtimeout
- _cleanqueue = new.cleanqueue
- _maxclientsperserver = new._maxclientsperserver or _maxclientsperserver
- _maxsslhandshake = new._maxsslhandshake or _maxsslhandshake
+ _selecttimeout = tonumber( new.select_timeout ) or _selecttimeout
+ _sleeptime = tonumber( new.select_sleep_time ) or _sleeptime
+ _maxsendlen = tonumber( new.max_send_buffer_size ) or _maxsendlen
+ _maxreadlen = tonumber( new.max_receive_buffer_size ) or _maxreadlen
+ _checkinterval = tonumber( new.select_idle_check_interval ) or _checkinterval
+ _sendtimeout = tonumber( new.send_timeout ) or _sendtimeout
+ _readtimeout = tonumber( new.read_timeout ) or _readtimeout
+ _cleanqueue = new.select_clean_queue
+ _maxclientsperserver = new.max_connections or _maxclientsperserver
+ _maxsslhandshake = new.max_ssl_handshake_roundtrips or _maxsslhandshake
return true
end