aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-02-13 22:59:27 +0000
committerMatthew Wild <mwild1@gmail.com>2011-02-13 22:59:27 +0000
commit3e2bac693fd8c68ad88080e54f7935f59b95e866 (patch)
treea26df63501bbfefcc4971b71c431e6b86bf8411f
parenta5e641fa8f2928ccd7e5b85647db6b008eecc295 (diff)
parent404c107e3fd464e5bb35b792eb4a13ac22071afa (diff)
downloadprosody-3e2bac693fd8c68ad88080e54f7935f59b95e866.tar.gz
prosody-3e2bac693fd8c68ad88080e54f7935f59b95e866.zip
Merge 0.8->trunk
-rw-r--r--net/httpserver.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/httpserver.lua b/net/httpserver.lua
index d401f47c..33ced072 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -122,6 +122,7 @@ 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