# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1449159213 0
# Node ID 5360bdf93fcead613799edca7409592fe451d442
# Parent  ed5440a6ef7fa6741eb9011f9158c79440d43552# Parent  e3be91ccca05abc5051b8f1c481719dda4bfb5cb
Merge 0.10->trunk

diff -r ed5440a6ef7f -r 5360bdf93fce net/http/server.lua
--- a/net/http/server.lua	Thu Dec 03 16:13:12 2015 +0000
+++ b/net/http/server.lua	Thu Dec 03 16:13:33 2015 +0000
@@ -11,6 +11,7 @@
 local xpcall = xpcall;
 local traceback = debug.traceback;
 local tostring = tostring;
+local cache = require "util.cache";
 local codes = require "net.http.codes";
 
 local _M = {};