Mercurial > prosody-hg

comparison net/server.lua @ 7098:5286e79c6829

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Fri, 22 Jan 2016 14:49:05 +0100
parents bd0ff8ae98a8 3e1dac35af87
children 8e64e7b82928
comparison
equal deleted inserted replaced
7090:7aa37d70944b 7098:5286e79c6829
48 end 48 end
49 local function load_config() 49 local function load_config()
50 local settings = config_get("*", "network_settings") or {}; 50 local settings = config_get("*", "network_settings") or {};
51 if use_luaevent then 51 if use_luaevent then
52 local event_settings = { 52 local event_settings = {
53 ACCEPT_DELAY = settings.event_accept_retry_interval; 53 ACCEPT_DELAY = settings.accept_retry_interval;
54 ACCEPT_QUEUE = settings.tcp_backlog; 54 ACCEPT_QUEUE = settings.tcp_backlog;
55 CLEAR_DELAY = settings.event_clear_interval; 55 CLEAR_DELAY = settings.event_clear_interval;
56 CONNECT_TIMEOUT = settings.connect_timeout; 56 CONNECT_TIMEOUT = settings.connect_timeout;
57 DEBUG = settings.debug; 57 DEBUG = settings.debug;
58 HANDSHAKE_TIMEOUT = settings.ssl_handshake_timeout; 58 HANDSHAKE_TIMEOUT = settings.ssl_handshake_timeout;