diff options
author | Kim Alvefur <zash@zash.se> | 2016-08-08 16:41:09 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-08-08 16:41:09 +0200 |
commit | 68f3c9dede8ad33e50057c2566964285e18874bc (patch) | |
tree | 28ff249f142d219a8fe1f7ede89996f393084875 /net | |
parent | 0b44bf4b7fbbc088ab2a1d90f7e19c68a46601ea (diff) | |
parent | 3506b088471128c7579c11782dff473223f49579 (diff) | |
download | prosody-68f3c9dede8ad33e50057c2566964285e18874bc.tar.gz prosody-68f3c9dede8ad33e50057c2566964285e18874bc.zip |
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r-- | net/http/server.lua | 2 |
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 = {}; |