# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1297637967 0
# Node ID a1ff207af2806ebe6af759a92b99c069134bf7b1
# Parent  caa78589598f36a25247b498e78ee82ba6da05ae# Parent  eccd3c87d717139dbbfdb166c9041621c4438cbe
Merge 0.8->trunk

diff -r caa78589598f -r a1ff207af280 net/httpserver.lua
--- a/net/httpserver.lua	Sun Feb 13 19:28:29 2011 +0000
+++ b/net/httpserver.lua	Sun Feb 13 22:59:27 2011 +0000
@@ -122,6 +122,7 @@
 			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