aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-16 22:44:43 +0100
committerKim Alvefur <zash@zash.se>2016-01-16 22:44:43 +0100
commitf763095b66a53b0fcc73f21a99478deabebd2a5b (patch)
treebde7b68581a288e5d3fc8a036c80502296972394 /core
parente49c053133ec90f007ba2f8575773f3cf5c20b54 (diff)
parent92a6c7fbd21fd445f3bdeca240030264b1756961 (diff)
downloadprosody-f763095b66a53b0fcc73f21a99478deabebd2a5b.tar.gz
prosody-f763095b66a53b0fcc73f21a99478deabebd2a5b.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
-rw-r--r--core/portmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua
index ad1a0be3..60f7731d 100644
--- a/core/portmanager.lua
+++ b/core/portmanager.lua
@@ -29,7 +29,7 @@ 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;
+local default_mode = config.get("*", "network_default_read_size") or "*a";
--- Private state