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
commit48f8c23f4ab0e8400e20101960055eb29c4aa6f7 (patch)
treebde7b68581a288e5d3fc8a036c80502296972394 /core
parent69f9998d1641846399e3d2818da4fd07ae05739a (diff)
parent83e7c91e0130f27720406b87996c4c74b7cc0afe (diff)
downloadprosody-48f8c23f4ab0e8400e20101960055eb29c4aa6f7.tar.gz
prosody-48f8c23f4ab0e8400e20101960055eb29c4aa6f7.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