Merge 0.9->trunk

[prosody.git] / net / http / server.lua

diff --git a/net/http/server.lua b/net/http/server.lua
index 577b05ef06baf6ac4e9bc34d51566a7034f053bb..0f379e96c625e726f554184e8735decb879a7d6b 100644 (file)
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -9,7 +9,7 @@ local pairs = pairs;
 local s_upper = string.upper;
 local setmetatable = setmetatable;
 local xpcall = xpcall;
-local debug = debug;
+local traceback = debug.traceback;
 local tostring = tostring;
 local codes = require "net.http.codes";
 
@@ -88,7 +88,7 @@ local _1, _2, _3;
 local function _handle_request() return handle_request(_1, _2, _3); end
 
 local last_err;
-local function _traceback_handler(err) last_err = err; log("error", "Traceback[http]: %s: %s", tostring(err), debug.traceback()); end
+local function _traceback_handler(err) last_err = err; log("error", "Traceback[httpserver]: %s", traceback(tostring(err), 2)); end
 events.add_handler("http-error", function (error)
        return "Error processing request: "..codes[error.code]..". Check your error log for more information.";
 end, -1);
@@ -168,7 +168,7 @@ function handle_request(conn, request, finish_cb)
        local conn_header = request.headers.connection;
        conn_header = conn_header and ","..conn_header:gsub("[ \t]", ""):lower().."," or ""
        local httpversion = request.httpversion
-       local persistent = conn_header:find(",Keep-Alive,", 1, true)
+       local persistent = conn_header:find(",keep-alive,", 1, true)
                or (httpversion == "1.1" and not conn_header:find(",close,", 1, true));
 
        local response_conn_header;