Automated merge with http://waqas.ath.cx:8000/

[prosody.git] / net / httpserver.lua

diff --git a/net/httpserver.lua b/net/httpserver.lua
index b16e7f3a93844c43884faf69b0e670d938050f98..af23a91d95fb73113edfc40bbb41bfc99147e03a 100644 (file)
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -11,8 +11,7 @@ local t_insert, t_concat = table.insert, table.concat;
 local s_match, s_gmatch = string.match, string.gmatch;
 local tonumber, tostring, pairs = tonumber, tostring, pairs;
 
-local urlcodes = setmetatable({}, { __index = function (t, k) t[k] = char(tonumber("0x"..k)); return t[k]; end });
-local urlencode = function (s) return s and (s:gsub("%W", function (c) return string.format("%%%x", c:byte()); end)); end
+local urlencode = function (s) return s and (s:gsub("%W", function (c) return string.format("%%%02x", c:byte()); end)); end
 
 local log = require "util.logger".init("httpserver");
 
@@ -30,7 +29,7 @@ local function send_response(request, response)
        -- Write status line
        local resp;
        if response.body then
-               log("debug", "Sending response to %s: %s", request.id, response.body);
+               log("debug", "Sending response to %s", request.id);
                resp = { "HTTP/1.0 ", response.status or "200 OK", "\r\n"};
                local h = response.headers;
                if h then
@@ -99,7 +98,7 @@ local function call_callback(request, err)
                        if response == true and not request.destroyed then
                                -- Keep connection open, we will reply later
                                log("warn", "Request %s left open, on_destroy is %s", request.id, tostring(request.on_destroy));
-                       else
+                       elseif response ~= true then
                                -- Assume response
                                send_response(request, response);
                                destroy_request(request);