diff options
author | Kim Alvefur <zash@zash.se> | 2016-01-11 15:33:18 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-01-11 15:33:18 +0100 |
commit | 0f3612a00ab41115dc05c790f4ac0f26331a9daf (patch) | |
tree | 9021ac71e1747dce473019f7dc14803d4fa4751a /core | |
parent | 0d98ccd02a37153aef1cbfb71ba9c103d43fbda7 (diff) | |
parent | 14d035cf4351540c4b8751fa47db1c1f421eb7ce (diff) | |
download | prosody-0f3612a00ab41115dc05c790f4ac0f26331a9daf.tar.gz prosody-0f3612a00ab41115dc05c790f4ac0f26331a9daf.zip |
Merge 0.9->0.10
Diffstat (limited to 'core')
-rw-r--r-- | core/portmanager.lua | 2 |
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 |