diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-03-28 12:17:15 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-03-28 12:17:15 +0000 |
| commit | 0f44b53c15ed12d163902afaf93a88442d4c97d2 (patch) | |
| tree | 3cea0291902a5fcdc82a59e5fe1747c4f8217900 /net/server_select.lua | |
| parent | 11a3a158eb42284dd3585e04439f38ee3e6d548c (diff) | |
| parent | 64440086ea5ee8d2f1726f2101ced46d4f08b929 (diff) | |
| download | prosody-0f44b53c15ed12d163902afaf93a88442d4c97d2.tar.gz prosody-0f44b53c15ed12d163902afaf93a88442d4c97d2.zip | |
Merge 0.9->trunk
Diffstat (limited to 'net/server_select.lua')
| -rw-r--r-- | net/server_select.lua | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/net/server_select.lua b/net/server_select.lua index 63a94b7e..8ce9eed2 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -769,7 +769,18 @@ closeall = function( ) end getsettings = function( ) - return _selecttimeout, _sleeptime, _maxsendlen, _maxreadlen, _checkinterval, _sendtimeout, _readtimeout, nil, _maxselectlen, _maxsslhandshake, _maxfd + return { + select_timeout = _selecttimeout; + select_sleep_time = _sleeptime; + max_send_buffer_size = _maxsendlen; + max_receive_buffer_size = _maxreadlen; + select_idle_check_interval = _checkinterval; + send_timeout = _sendtimeout; + read_timeout = _readtimeout; + max_connections = _maxselectlen; + max_ssl_handshake_roundtrips = _maxsslhandshake; + highest_allowed_fd = _maxfd; + } end changesettings = function( new ) |