Mercurial > prosody-hg
comparison core/portmanager.lua @ 7085:343be83ddfa6
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 16 Jan 2016 22:44:43 +0100 |
| parents | ec17115e3721 |
| children | d6f12056afda |
comparison
equal
deleted
inserted
replaced
| 7075:47a2deb74b56 | 7085:343be83ddfa6 |
|---|---|
| 27 if socket.tcp6 and config.get("*", "use_ipv6") ~= false then | 27 if socket.tcp6 and config.get("*", "use_ipv6") ~= false then |
| 28 table.insert(default_interfaces, "::"); | 28 table.insert(default_interfaces, "::"); |
| 29 table.insert(default_local_interfaces, "::1"); | 29 table.insert(default_local_interfaces, "::1"); |
| 30 end | 30 end |
| 31 | 31 |
| 32 local default_mode = config.get("*", "network_default_read_size") or 4096; | 32 local default_mode = config.get("*", "network_default_read_size") or "*a"; |
| 33 | 33 |
| 34 --- Private state | 34 --- Private state |
| 35 | 35 |
| 36 -- service_name -> { service_info, ... } | 36 -- service_name -> { service_info, ... } |
| 37 local services = setmetatable({}, { __index = function (t, k) rawset(t, k, {}); return rawget(t, k); end }); | 37 local services = setmetatable({}, { __index = function (t, k) rawset(t, k, {}); return rawget(t, k); end }); |
