diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-12-03 16:13:33 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-12-03 16:13:33 +0000 |
commit | 83032c99421f143eb305df8bb1df6dfebe36abf9 (patch) | |
tree | f1c797f19cad4a3ec583963a4ef16fead9aa08d6 | |
parent | 0bd91699304e6e338d4bc934f331349d70debaac (diff) | |
parent | 6d8484bb7ba2a1320b190b1dfc0a0496167815ae (diff) | |
download | prosody-83032c99421f143eb305df8bb1df6dfebe36abf9.tar.gz prosody-83032c99421f143eb305df8bb1df6dfebe36abf9.zip |
Merge 0.10->trunk
-rw-r--r-- | net/http/server.lua | 1 |
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 = {}; |