aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-04-05 13:26:43 +0100
committerMatthew Wild <mwild1@gmail.com>2011-04-05 13:26:43 +0100
commit1cfb734e0ecde10fcd5f457c1394ecb3b7a28e2a (patch)
tree35cdd4996c2ba4c67a4805bd01e3830d1dc171f5 /net
parent272ca5fce11d42d9cd3b50c0f3baa03729583443 (diff)
parentca74173a8221e9cd93db30c7bb89c8b181f8b60b (diff)
downloadprosody-1cfb734e0ecde10fcd5f457c1394ecb3b7a28e2a.tar.gz
prosody-1cfb734e0ecde10fcd5f457c1394ecb3b7a28e2a.zip
Merge 0.8->trunk
Diffstat (limited to 'net')
-rw-r--r--net/httpserver.lua1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/httpserver.lua b/net/httpserver.lua
index e0fd3f86..74f61c56 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -136,7 +136,6 @@ local function request_reader(request, data, startpos)
call_callback(request);
end
local function error_cb(r)
- log("error", "Error in HTTP server handler: %s", r or "connection-closed");
call_callback(request, r or "connection-closed");
destroy_request(request);
end