aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-08-08 16:41:09 +0200
committerKim Alvefur <zash@zash.se>2016-08-08 16:41:09 +0200
commit69f217b1ca6186253459f8c3d0772b814e7aa0dc (patch)
tree28ff249f142d219a8fe1f7ede89996f393084875 /net
parentac565db2d8dc8239ab1c6bf4d3fadc2ca8c78d5f (diff)
parent8499f4e7214e86623d614368268913418289254c (diff)
downloadprosody-69f217b1ca6186253459f8c3d0772b814e7aa0dc.tar.gz
prosody-69f217b1ca6186253459f8c3d0772b814e7aa0dc.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r--net/http/server.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http/server.lua b/net/http/server.lua
index bc39767f..ba45ede0 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -13,7 +13,7 @@ local traceback = debug.traceback;
local tostring = tostring;
local cache = require "util.cache";
local codes = require "net.http.codes";
-local blocksize = require "socket".BLOCKSIZE or 2048;
+local blocksize = 2^16;
local _M = {};