diff options
| author | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:42:22 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2014-04-02 17:42:22 +0100 |
| commit | 499cb87234e01044440591b90c8eb46e63d1e01a (patch) | |
| tree | 861eaefae2bd906eace48b17e5f6172dca6c8f5c /core/portmanager.lua | |
| parent | c98c0fb432db6ce9c7bbcd433168aa27b36854b8 (diff) | |
| parent | 27b4049481f29dcac2d6093c40ad7e8bf1ea8899 (diff) | |
| download | prosody-499cb87234e01044440591b90c8eb46e63d1e01a.tar.gz prosody-499cb87234e01044440591b90c8eb46e63d1e01a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/portmanager.lua')
| -rw-r--r-- | core/portmanager.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua index 95900c08..4cbf3eb3 100644 --- a/core/portmanager.lua +++ b/core/portmanager.lua @@ -29,6 +29,8 @@ if socket.tcp6 and config.get("*", "use_ipv6") ~= false then table.insert(default_local_interfaces, "::1"); end +local default_mode = config.get("*", "network_default_read_size") or 4096; + --- Private state -- service_name -> { service_info, ... } @@ -111,7 +113,7 @@ function activate(service_name) } bind_ports = set.new(type(bind_ports) ~= "table" and { bind_ports } or bind_ports ); - local mode, ssl = listener.default_mode or "*a"; + local mode, ssl = listener.default_mode or default_mode; local hooked_ports = {}; for interface in bind_interfaces do |