Changeset

5197:beffe931b3b6

net.server_select: Better names for config options (thanks MattJ)
author Kim Alvefur <zash@zash.se>
date Fri, 23 Nov 2012 01:51:30 +0100
parents 5195:ce5d7538ac48
children 5198:430797a8fc81
files net/server_select.lua
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/net/server_select.lua	Thu Nov 22 21:57:06 2012 +0000
+++ b/net/server_select.lua	Fri Nov 23 01:51:30 2012 +0100
@@ -749,16 +749,16 @@
 	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