Merge with backout

[prosody.git] / net / http / server.lua
diff --git a/net/http/server.lua b/net/http/server.lua

index c108a398b7b86b3fc9a9434ee4592d76acd460d0..d693fb528e1073e4e436e1ae5a2f66fc072f768d 100644 (file)
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -41,7 +41,7 @@ setmetatable(events._handlers, {
                         if event == curr_event or
                         is_wildcard_event(event) and is_wildcard_match(event, curr_event) then
                                 for handler, priority in pairs(handlers_set) do
-                                       matching_handlers_set[handler] = { (select(2, event:gsub("/", "%1"))), priority };
+                                       matching_handlers_set[handler] = { (select(2, event:gsub("/", "%1"))), is_wildcard_event(event) and 0 or 1, priority };
                                         table.insert(handlers_array, handler);
                                 end
                         end
@@ -50,7 +50,7 @@ setmetatable(events._handlers, {
                 table.sort(handlers_array, function(b, a)
                         local a_score, b_score = matching_handlers_set[a], matching_handlers_set[b];
                         for i = 1, #a_score do
-                               if a ~= b then -- If equal, compare next score value
+                               if a_score[i] ~= b_score[i] then -- If equal, compare next score value
                                         return a_score[i] < b_score[i];
                                 end
                         end
@@ -75,7 +75,12 @@ setmetatable(events._handlers, {
  local handle_request;
  local _1, _2, _3;
  local function _handle_request() return handle_request(_1, _2, _3); end
-local function _traceback_handler(err) log("error", "Traceback[http]: %s: %s", tostring(err), debug.traceback()); end
+
+local last_err;
+local function _traceback_handler(err) last_err = err; log("error", "Traceback[http]: %s: %s", tostring(err), debug.traceback()); end
+events.add_handler("http-error", function (error)
+       return "Error processing request: "..codes[error.code]..". Check your error log for more information.";
+end, -1);
  
  function listener.onconnect(conn)
         local secure = conn:ssl() and true or nil;
@@ -90,7 +95,7 @@ function listener.onconnect(conn)
                         --handle_request(conn, request, process_next);
                         _1, _2, _3 = conn, request, process_next;
                         if not xpcall(_handle_request, _traceback_handler) then
-                               conn:write("HTTP/1.0 503 Internal Server Error\r\n\r\nAn error occured during the processing of this request.");
+                               conn:write("HTTP/1.0 500 Internal Server Error\r\n\r\n"..events.fire_event("http-error", { code = 500, private_message = last_err }));
                                 conn:close();
                         end
                 else
@@ -161,10 +166,17 @@ function handle_request(conn, request, finish_cb)
         };
         conn._http_open_response = response;
  
+       local err;
         if not request.headers.host then
+               err = "No 'Host' header";
+       elseif not request.path then
+               err = "Invalid path";
+       end
+       
+       if err then
                 response.status_code = 400;
                 response.headers.content_type = "text/html";
-               response:send("<html><head>400 Bad Request</head><body>400 Bad Request: No Host header.</body></html>");
+               response:send(events.fire_event("http-error", { code = 400, message = err }));
         else
                 local host = request.headers.host;
                 if host then
@@ -179,6 +191,9 @@ function handle_request(conn, request, finish_cb)
                                         local result_type = type(result);
                                         if result_type == "number" then
                                                 response.status_code = result;
+                                               if result >= 400 then
+                                                       body = events.fire_event("http-error", { code = result });
+                                               end
                                         elseif result_type == "string" then
                                                 body = result;
                                         elseif result_type == "table" then
@@ -197,7 +212,7 @@ function handle_request(conn, request, finish_cb)
                 -- if handler not called, return 404
                 response.status_code = 404;
                 response.headers.content_type = "text/html";
-               response:send("<html><head><title>404 Not Found</title></head><body>404 Not Found: No such page.</body></html>");
+               response:send(events.fire_event("http-error", { code = 404 }));
         end
  end
  function _M.send_response(response, body)
@@ -241,4 +256,5 @@ end
  
  _M.listener = listener;
  _M.codes = codes;
+_M._events = events;
  return _M;