Software / code / prosody
Diff
core/portmanager.lua @ 6055:596539a30e9b
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 02 Apr 2014 17:42:22 +0100 |
| parent | 6054:7a5ddbaf758d |
| child | 6295:cb12ff49503d |
line wrap: on
line diff
--- a/core/portmanager.lua Tue Mar 25 19:18:32 2014 +0100 +++ b/core/portmanager.lua Wed Apr 02 17:42:22 2014 +0100 @@ -29,6 +29,8 @@ 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 @@ } 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
