aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-12-03 16:13:33 +0000
committerMatthew Wild <mwild1@gmail.com>2015-12-03 16:13:33 +0000
commit668d9211112be0103194ff616206b4c35b621a2e (patch)
treef1c797f19cad4a3ec583963a4ef16fead9aa08d6
parentfd8f4e67d9cdf6c5de7ea86392573bfd7029160f (diff)
parent3917c11387ea06fdcc2a385c4954c47efa53f356 (diff)
downloadprosody-668d9211112be0103194ff616206b4c35b621a2e.tar.gz
prosody-668d9211112be0103194ff616206b4c35b621a2e.zip
Merge 0.10->trunk
-rw-r--r--net/http/server.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/http/server.lua b/net/http/server.lua
index acfb8a1d..9649d0e8 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -11,6 +11,7 @@ local setmetatable = setmetatable;
local xpcall = xpcall;
local traceback = debug.traceback;
local tostring = tostring;
+local cache = require "util.cache";
local codes = require "net.http.codes";
local _M = {};