From bfea56261df0d33fa179a3787adf4d4dcbf24d29 Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Wed, 23 Feb 2011 02:03:55 +0500
Subject: net.httpserver: Catch errors thrown in HTTP handlers.
---
net/httpserver.lua | 8 ++++++++
1 file changed, 8 insertions(+)
(limited to 'net')
diff --git a/net/httpserver.lua b/net/httpserver.lua
index 33ced072..6d6408f7 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -17,6 +17,8 @@ local listener;
local t_insert, t_concat = table.insert, table.concat;
local tonumber, tostring, pairs, ipairs, type = tonumber, tostring, pairs, ipairs, type;
+local xpcall = xpcall;
+local debug_traceback = debug.traceback;
local urlencode = function (s) return s and (s:gsub("%W", function (c) return ("%%%02x"):format(c:byte()); end)); end
@@ -86,6 +88,12 @@ local function call_callback(request, err)
callback = (request.server and request.server.handlers[base]) or default_handler;
end
if callback then
+ local _callback = callback;
+ function callback(a, b, c)
+ local status, result = xpcall(function() _callback(a, b, c) end, debug_traceback);
+ if status then return result; end
+ log("error", "Error in HTTP server handler: %s", result);
+ end
if err then
log("debug", "Request error: "..err);
if not callback(nil, err, request) then
--
cgit v1.2.3