aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-05-04 16:58:25 +0200
committerKim Alvefur <zash@zash.se>2016-05-04 16:58:25 +0200
commit4c1aa4d4ee89dcd4738c73a29e7c13774428b9ba (patch)
tree4069efefa5eba71585ead8faa0cbe970de5dcecd /core
parentea6f8f4f6ac68d671fa09ec177617e781e4a915f (diff)
parentb919112a2e1e1ce92a6abb073ec56cda2b6afb8e (diff)
downloadprosody-4c1aa4d4ee89dcd4738c73a29e7c13774428b9ba.tar.gz
prosody-4c1aa4d4ee89dcd4738c73a29e7c13774428b9ba.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 60f7731d..ad1a0be3 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 "*a";
+local default_mode = config.get("*", "network_default_read_size") or 4096;
--- Private state