Software `/` code `/` prosody

Annotate

net/http/server.lua @ 9751:39ee70fbb009

mod_mam: Perform message expiry based on building an index by date For each day, store a set of users that have new messages. To expire messages, we collect the union of sets of users from dates that fall outside the cleanup range. The previous algoritm did not work well with many users, especially with the default settings.

author	Kim Alvefur <zash@zash.se>
date	Thu, 03 Jan 2019 17:25:43 +0100
parent	9624:cc9dff0212f4
child	10323:73938168681c
child	10950:a23328c46389

rev	line source
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	2 local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	3 local parser_new = require "net.http.parser".new;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	4 local events = require "util.events".new();
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	5 local addserver = require "net.server".addserver;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	6 local log = require "util.logger".init("http.server");
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	7 local os_date = os.date;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	8 local pairs = pairs;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	9 local s_upper = string.upper;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	10 local setmetatable = setmetatable;
9562 acf74ad0b795 Many things: switch from hacky multi-arg xpcall implementations to a standard util.xpcall Matthew Wild <mwild1@gmail.com> parents: 9379 diff changeset	11 local xpcall = require "util.xpcall".xpcall;
5505 0b6a99e6c1b1 mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit traceback function), to make it clearer where an error occured Matthew Wild <mwild1@gmail.com> parents: 5504 diff changeset	12 local traceback = debug.traceback;
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	13 local tostring = tostring;
6963 e3be91ccca05 net.http.server: Import util.cache Matthew Wild <mwild1@gmail.com> parents: 6950 diff changeset	14 local cache = require "util.cache";
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	15 local codes = require "net.http.codes";
7541 1d3f9da189b5 net.http.server: Set blocksize for serving data from FDs to 64k (sweet spot of efficiency according to a recent study) Kim Alvefur <zash@zash.se> parents: 7489 diff changeset	16 local blocksize = 2^16;
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	17
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	18 local _M = {};
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	19
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	20 local sessions = {};
7489 d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	21 local incomplete = {};
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	22 local listener = {};
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	23 local hosts = {};
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	24 local default_host;
7579 d430573fe9f8 net.http.server: Expose way to set http server options Kim Alvefur <zash@zash.se> parents: 6589 diff changeset	25 local options = {};
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	26
4668 cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	27 local function is_wildcard_event(event)
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	28 return event:sub(-2, -1) == "/*";
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	29 end
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	30 local function is_wildcard_match(wildcard_event, event)
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	31 return wildcard_event:sub(1, -2) == event:sub(1, #wildcard_event-1);
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	32 end
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	33
6950 8ab809358922 net.http.server: Use new util.cache to remember wildcard event handlers Matthew Wild <mwild1@gmail.com> parents: 6608 diff changeset	34 local _handlers = events._handlers;
7582 e080b8b4f3cb net.http.server: Add luacheck annotations Kim Alvefur <zash@zash.se> parents: 7581 diff changeset	35 local recent_wildcard_events = cache.new(10000, function (key, value) -- luacheck: ignore 212/value
6950 8ab809358922 net.http.server: Use new util.cache to remember wildcard event handlers Matthew Wild <mwild1@gmail.com> parents: 6608 diff changeset	36 rawset(_handlers, key, nil);
8ab809358922 net.http.server: Use new util.cache to remember wildcard event handlers Matthew Wild <mwild1@gmail.com> parents: 6608 diff changeset	37 end);
5503 91052e59375c net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries) Matthew Wild <mwild1@gmail.com> parents: 5487 diff changeset	38
4668 cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	39 local event_map = events._event_map;
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	40 setmetatable(events._handlers, {
5504 b760b5f0c2b0 net.server.http: Add a comment Matthew Wild <mwild1@gmail.com> parents: 5503 diff changeset	41 -- Called when firing an event that doesn't exist (but may match a wildcard handler)
4668 cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	42 __index = function (handlers, curr_event)
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	43 if is_wildcard_event(curr_event) then return; end -- Wildcard events cannot be fired
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	44 -- Find all handlers that could match this event, sort them
4689 e8c357259993 net.http.server: Small fix to comment Matthew Wild <mwild1@gmail.com> parents: 4688 diff changeset	45 -- and then put the array into handlers[curr_event] (and return it)
4668 cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	46 local matching_handlers_set = {};
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	47 local handlers_array = {};
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	48 for event, handlers_set in pairs(event_map) do
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	49 if event == curr_event or
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	50 is_wildcard_event(event) and is_wildcard_match(event, curr_event) then
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	51 for handler, priority in pairs(handlers_set) do
4704 d6c4e58333cf net.http.server: Lower score of wildcard handlers to ensure specific handlers beat them Matthew Wild <mwild1@gmail.com> parents: 4694 diff changeset	52 matching_handlers_set[handler] = { (select(2, event:gsub("/", "%1"))), is_wildcard_event(event) and 0 or 1, priority };
4668 cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	53 table.insert(handlers_array, handler);
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	54 end
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	55 end
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	56 end
4726 917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	57 if #handlers_array > 0 then
917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	58 table.sort(handlers_array, function(b, a)
917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	59 local a_score, b_score = matching_handlers_set[a], matching_handlers_set[b];
917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	60 for i = 1, #a_score do
917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	61 if a_score[i] ~= b_score[i] then -- If equal, compare next score value
917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	62 return a_score[i] < b_score[i];
917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	63 end
4668 cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	64 end
4726 917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	65 return false;
917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	66 end);
917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	67 else
917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	68 handlers_array = false;
917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	69 end
917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	70 rawset(handlers, curr_event, handlers_array);
5503 91052e59375c net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries) Matthew Wild <mwild1@gmail.com> parents: 5487 diff changeset	71 if not event_map[curr_event] then -- Only wildcard handlers match, if any
6950 8ab809358922 net.http.server: Use new util.cache to remember wildcard event handlers Matthew Wild <mwild1@gmail.com> parents: 6608 diff changeset	72 recent_wildcard_events:set(curr_event, true);
5503 91052e59375c net.server.http: Ensure that event map cannot grow forever (limit to 10K wildcard-only entries) Matthew Wild <mwild1@gmail.com> parents: 5487 diff changeset	73 end
4668 cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	74 return handlers_array;
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	75 end;
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	76 __newindex = function (handlers, curr_event, handlers_array)
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	77 if handlers_array == nil
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	78 and is_wildcard_event(curr_event) then
4735 474166c08319 net.http.server: Improve comment Matthew Wild <mwild1@gmail.com> parents: 4727 diff changeset	79 -- Invalidate the indexes of all matching events
4668 cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	80 for event in pairs(handlers) do
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	81 if is_wildcard_match(curr_event, event) then
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	82 handlers[event] = nil;
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	83 end
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	84 end
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	85 end
4726 917a5ffb73f1 net.http.server: Correctly cache results of handler indexing, and also cache failures Matthew Wild <mwild1@gmail.com> parents: 4715 diff changeset	86 rawset(handlers, curr_event, handlers_array);
4668 cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	87 end;
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	88 });
cce0c739b0d7 net.http.server: Support for wildcard events (events that end with '/') Matthew Wild <mwild1@gmail.com>* parents: 4659 diff changeset	89
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	90 local handle_request;
4710 54ca6511e699 net.http.server: Make error handling overrideable via 'http-error' event Matthew Wild <mwild1@gmail.com> parents: 4709 diff changeset	91
54ca6511e699 net.http.server: Make error handling overrideable via 'http-error' event Matthew Wild <mwild1@gmail.com> parents: 4709 diff changeset	92 local last_err;
5505 0b6a99e6c1b1 mod_c2s, mod_s2s, net.http, net.http.server: Improve tracebacks (omit traceback function), to make it clearer where an error occured Matthew Wild <mwild1@gmail.com> parents: 5504 diff changeset	93 local function _traceback_handler(err) last_err = err; log("error", "Traceback[httpserver]: %s", traceback(tostring(err), 2)); end
4710 54ca6511e699 net.http.server: Make error handling overrideable via 'http-error' event Matthew Wild <mwild1@gmail.com> parents: 4709 diff changeset	94 events.add_handler("http-error", function (error)
54ca6511e699 net.http.server: Make error handling overrideable via 'http-error' event Matthew Wild <mwild1@gmail.com> parents: 4709 diff changeset	95 return "Error processing request: "..codes[error.code]..". Check your error log for more information.";
54ca6511e699 net.http.server: Make error handling overrideable via 'http-error' event Matthew Wild <mwild1@gmail.com> parents: 4709 diff changeset	96 end, -1);
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	97
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	98 function listener.onconnect(conn)
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	99 local secure = conn:ssl() and true or nil;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	100 local pending = {};
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	101 local waiting = false;
4771 31a40da59308 net.http.server: Remove unused imports and variables (fixes traceback due to removed net.httpserver) Matthew Wild <mwild1@gmail.com> parents: 4740 diff changeset	102 local function process_next()
6360 ffcd3992a40c net.http.server: Comment out a log message Kim Alvefur <zash@zash.se> parents: 5754 diff changeset	103 if waiting then return; end -- log("debug", "can't process_next, waiting");
5333 760c345dc7a1 net.http.server: Ensure HTTP callbacks are never called recursively for pipelined requests. Waqas Hussain <waqas20@gmail.com> parents: 5300 diff changeset	104 waiting = true;
760c345dc7a1 net.http.server: Ensure HTTP callbacks are never called recursively for pipelined requests. Waqas Hussain <waqas20@gmail.com> parents: 5300 diff changeset	105 while sessions[conn] and #pending > 0 do
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	106 local request = t_remove(pending);
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	107 --log("debug", "process_next: %s", request.path);
9562 acf74ad0b795 Many things: switch from hacky multi-arg xpcall implementations to a standard util.xpcall Matthew Wild <mwild1@gmail.com> parents: 9379 diff changeset	108 if not xpcall(handle_request, _traceback_handler, conn, request, process_next) then
4710 54ca6511e699 net.http.server: Make error handling overrideable via 'http-error' event Matthew Wild <mwild1@gmail.com> parents: 4709 diff changeset	109 conn:write("HTTP/1.0 500 Internal Server Error\r\n\r\n"..events.fire_event("http-error", { code = 500, private_message = last_err }));
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	110 conn:close();
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	111 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	112 end
5333 760c345dc7a1 net.http.server: Ensure HTTP callbacks are never called recursively for pipelined requests. Waqas Hussain <waqas20@gmail.com> parents: 5300 diff changeset	113 --log("debug", "ready for more");
760c345dc7a1 net.http.server: Ensure HTTP callbacks are never called recursively for pipelined requests. Waqas Hussain <waqas20@gmail.com> parents: 5300 diff changeset	114 waiting = false;
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	115 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	116 local function success_cb(request)
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	117 --log("debug", "success_cb: %s", request.path);
5333 760c345dc7a1 net.http.server: Ensure HTTP callbacks are never called recursively for pipelined requests. Waqas Hussain <waqas20@gmail.com> parents: 5300 diff changeset	118 if waiting then
760c345dc7a1 net.http.server: Ensure HTTP callbacks are never called recursively for pipelined requests. Waqas Hussain <waqas20@gmail.com> parents: 5300 diff changeset	119 log("error", "http connection handler is not reentrant: %s", request.path);
760c345dc7a1 net.http.server: Ensure HTTP callbacks are never called recursively for pipelined requests. Waqas Hussain <waqas20@gmail.com> parents: 5300 diff changeset	120 assert(false, "http connection handler is not reentrant");
760c345dc7a1 net.http.server: Ensure HTTP callbacks are never called recursively for pipelined requests. Waqas Hussain <waqas20@gmail.com> parents: 5300 diff changeset	121 end
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	122 request.secure = secure;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	123 t_insert(pending, request);
5333 760c345dc7a1 net.http.server: Ensure HTTP callbacks are never called recursively for pipelined requests. Waqas Hussain <waqas20@gmail.com> parents: 5300 diff changeset	124 process_next();
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	125 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	126 local function error_cb(err)
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	127 log("debug", "error_cb: %s", err or "<nil>");
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	128 -- FIXME don't close immediately, wait until we process current stuff
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	129 -- FIXME if err, send off a bad-request response
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	130 sessions[conn] = nil;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	131 conn:close();
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	132 end
7579 d430573fe9f8 net.http.server: Expose way to set http server options Kim Alvefur <zash@zash.se> parents: 6589 diff changeset	133 local function options_cb()
d430573fe9f8 net.http.server: Expose way to set http server options Kim Alvefur <zash@zash.se> parents: 6589 diff changeset	134 return options;
d430573fe9f8 net.http.server: Expose way to set http server options Kim Alvefur <zash@zash.se> parents: 6589 diff changeset	135 end
d430573fe9f8 net.http.server: Expose way to set http server options Kim Alvefur <zash@zash.se> parents: 6589 diff changeset	136 sessions[conn] = parser_new(success_cb, error_cb, "server", options_cb);
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	137 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	138
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	139 function listener.ondisconnect(conn)
4691 a164fc7057ae net.http.server: Support for on_destroy callback on response objects, and a 'finished' flag to say when they are destroyed (responded to or connection closed) Matthew Wild <mwild1@gmail.com> parents: 4689 diff changeset	140 local open_response = conn._http_open_response;
a164fc7057ae net.http.server: Support for on_destroy callback on response objects, and a 'finished' flag to say when they are destroyed (responded to or connection closed) Matthew Wild <mwild1@gmail.com> parents: 4689 diff changeset	141 if open_response and open_response.on_destroy then
a164fc7057ae net.http.server: Support for on_destroy callback on response objects, and a 'finished' flag to say when they are destroyed (responded to or connection closed) Matthew Wild <mwild1@gmail.com> parents: 4689 diff changeset	142 open_response.finished = true;
a164fc7057ae net.http.server: Support for on_destroy callback on response objects, and a 'finished' flag to say when they are destroyed (responded to or connection closed) Matthew Wild <mwild1@gmail.com> parents: 4689 diff changeset	143 open_response:on_destroy();
a164fc7057ae net.http.server: Support for on_destroy callback on response objects, and a 'finished' flag to say when they are destroyed (responded to or connection closed) Matthew Wild <mwild1@gmail.com> parents: 4689 diff changeset	144 end
7489 d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	145 incomplete[conn] = nil;
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	146 sessions[conn] = nil;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	147 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	148
6380 4220ffb87b22 net.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent) Matthew Wild <mwild1@gmail.com> parents: 6360 diff changeset	149 function listener.ondetach(conn)
4220ffb87b22 net.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent) Matthew Wild <mwild1@gmail.com> parents: 6360 diff changeset	150 sessions[conn] = nil;
7489 d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	151 incomplete[conn] = nil;
6380 4220ffb87b22 net.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent) Matthew Wild <mwild1@gmail.com> parents: 6360 diff changeset	152 end
4220ffb87b22 net.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent) Matthew Wild <mwild1@gmail.com> parents: 6360 diff changeset	153
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	154 function listener.onincoming(conn, data)
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	155 sessions[conn]:feed(data);
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	156 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	157
7489 d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	158 function listener.ondrain(conn)
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	159 local response = incomplete[conn];
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	160 if response and response._send_more then
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	161 response._send_more();
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	162 end
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	163 end
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	164
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	165 local headerfix = setmetatable({}, {
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	166 __index = function(t, k)
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	167 local v = "\r\n"..k:gsub("_", "-"):gsub("%f[%w].", s_upper)..": ";
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	168 t[k] = v;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	169 return v;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	170 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	171 });
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	172
7582 e080b8b4f3cb net.http.server: Add luacheck annotations Kim Alvefur <zash@zash.se> parents: 7581 diff changeset	173 function _M.hijack_response(response, listener) -- luacheck: ignore
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	174 error("TODO");
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	175 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	176 function handle_request(conn, request, finish_cb)
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	177 --log("debug", "handler: %s", request.path);
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	178 local headers = {};
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	179 for k,v in pairs(request.headers) do headers[k:gsub("-", "_")] = v; end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	180 request.headers = headers;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	181 request.conn = conn;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	182
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	183 local date_header = os_date('!%a, %d %b %Y %H:%M:%S GMT'); -- FIXME use
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	184 local conn_header = request.headers.connection;
5300 fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	185 conn_header = conn_header and ","..conn_header:gsub("[ \t]", ""):lower().."," or ""
fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	186 local httpversion = request.httpversion
5754 dee0f05ccf70 net.http.server: Fix Keep-Alive requests with HTTP 1.0 Kim Alvefur <zash@zash.se> parents: 5505 diff changeset	187 local persistent = conn_header:find(",keep-alive,", 1, true)
5300 fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	188 or (httpversion == "1.1" and not conn_header:find(",close,", 1, true));
fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	189
fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	190 local response_conn_header;
fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	191 if persistent then
fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	192 response_conn_header = "Keep-Alive";
fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	193 else
fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	194 response_conn_header = httpversion == "1.1" and "close" or nil
fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	195 end
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	196
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	197 local response = {
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	198 request = request;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	199 status_code = 200;
5300 fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	200 headers = { date = date_header, connection = response_conn_header };
fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	201 persistent = persistent;
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	202 conn = conn;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	203 send = _M.send_response;
7489 d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	204 send_file = _M.send_file;
6071 420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	205 done = _M.finish_response;
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	206 finish_cb = finish_cb;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	207 };
4691 a164fc7057ae net.http.server: Support for on_destroy callback on response objects, and a 'finished' flag to say when they are destroyed (responded to or connection closed) Matthew Wild <mwild1@gmail.com> parents: 4689 diff changeset	208 conn._http_open_response = response;
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	209
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	210 local host = (request.headers.host or ""):match("[^:]+");
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	211
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	212 -- Some sanity checking
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	213 local err_code, err;
4740 bd9c8bc8036f net.http.server: Try default_host if client sent no host anywhere, otherwise... fail. It's 2012. Matthew Wild <mwild1@gmail.com> parents: 4739 diff changeset	214 if not request.path then
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	215 err_code, err = 400, "Invalid path";
4713 9c15fa5192d3 net.http.server: Fire http-error 400 if request fails sanity checks Matthew Wild <mwild1@gmail.com> parents: 4710 diff changeset	216 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5754 diff changeset	217
4713 9c15fa5192d3 net.http.server: Fire http-error 400 if request fails sanity checks Matthew Wild <mwild1@gmail.com> parents: 4710 diff changeset	218 if err then
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	219 response.status_code = err_code;
8362 c7d6c2558a24 net.http.server: Include response object in most http-error events Kim Alvefur <zash@zash.se> parents: 7582 diff changeset	220 response:send(events.fire_event("http-error", { code = err_code, message = err, response = response }));
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	221 return;
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	222 end
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	223
9375 816591db764d net.http.server: Fire an event without host Kim Alvefur <zash@zash.se> parents: 9338 diff changeset	224 local global_event = request.method.." "..request.path:match("[^?]*");
9379 866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	225
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	226 local payload = { request = request, response = response };
9375 816591db764d net.http.server: Fire an event without host Kim Alvefur <zash@zash.se> parents: 9338 diff changeset	227 log("debug", "Firing event: %s", global_event);
816591db764d net.http.server: Fire an event without host Kim Alvefur <zash@zash.se> parents: 9338 diff changeset	228 local result = events.fire_event(global_event, payload);
816591db764d net.http.server: Fire an event without host Kim Alvefur <zash@zash.se> parents: 9338 diff changeset	229 if result == nil then
9379 866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	230 if not hosts[host] then
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	231 if hosts[default_host] then
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	232 host = default_host;
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	233 elseif host then
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	234 err_code, err = 404, "Unknown host: "..host;
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	235 else
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	236 err_code, err = 400, "Missing or invalid 'Host' header";
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	237 end
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	238 end
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	239
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	240 if err then
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	241 response.status_code = err_code;
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	242 response:send(events.fire_event("http-error", { code = err_code, message = err, response = response }));
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	243 return;
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	244 end
866cba3689f4 net.http.server: Delay host checks until after host-less event Kim Alvefur <zash@zash.se> parents: 9375 diff changeset	245
9624 cc9dff0212f4 net.http.server: Move event formation to avoid traceback on missing Host header Matthew Wild <mwild1@gmail.com> parents: 9562 diff changeset	246 local host_event = request.method.." "..host..request.path:match("[^?]*");
9375 816591db764d net.http.server: Fire an event without host Kim Alvefur <zash@zash.se> parents: 9338 diff changeset	247 log("debug", "Firing event: %s", host_event);
816591db764d net.http.server: Fire an event without host Kim Alvefur <zash@zash.se> parents: 9338 diff changeset	248 result = events.fire_event(host_event, payload);
816591db764d net.http.server: Fire an event without host Kim Alvefur <zash@zash.se> parents: 9338 diff changeset	249 end
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	250 if result ~= nil then
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	251 if result ~= true then
4788 e14f5a156571 net.http.server: Code cleanup/adjustment now that send_response() accepts response.body Matthew Wild <mwild1@gmail.com> parents: 4787 diff changeset	252 local body;
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	253 local result_type = type(result);
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	254 if result_type == "number" then
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	255 response.status_code = result;
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	256 if result >= 400 then
8362 c7d6c2558a24 net.http.server: Include response object in most http-error events Kim Alvefur <zash@zash.se> parents: 7582 diff changeset	257 payload.code = result;
c7d6c2558a24 net.http.server: Include response object in most http-error events Kim Alvefur <zash@zash.se> parents: 7582 diff changeset	258 body = events.fire_event("http-error", payload);
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	259 end
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	260 elseif result_type == "string" then
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	261 body = result;
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	262 elseif result_type == "table" then
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	263 for k, v in pairs(result) do
5404 ae9a47e579d7 net.http.server: Don't overwrite existing response.headers when returning a response object from a HTTP handler (waqas says it's wrong) Matthew Wild <mwild1@gmail.com> parents: 5333 diff changeset	264 if k ~= "headers" then
ae9a47e579d7 net.http.server: Don't overwrite existing response.headers when returning a response object from a HTTP handler (waqas says it's wrong) Matthew Wild <mwild1@gmail.com> parents: 5333 diff changeset	265 response[k] = v;
ae9a47e579d7 net.http.server: Don't overwrite existing response.headers when returning a response object from a HTTP handler (waqas says it's wrong) Matthew Wild <mwild1@gmail.com> parents: 5333 diff changeset	266 else
ae9a47e579d7 net.http.server: Don't overwrite existing response.headers when returning a response object from a HTTP handler (waqas says it's wrong) Matthew Wild <mwild1@gmail.com> parents: 5333 diff changeset	267 for header_name, header_value in pairs(v) do
ae9a47e579d7 net.http.server: Don't overwrite existing response.headers when returning a response object from a HTTP handler (waqas says it's wrong) Matthew Wild <mwild1@gmail.com> parents: 5333 diff changeset	268 response.headers[header_name] = header_value;
ae9a47e579d7 net.http.server: Don't overwrite existing response.headers when returning a response object from a HTTP handler (waqas says it's wrong) Matthew Wild <mwild1@gmail.com> parents: 5333 diff changeset	269 end
ae9a47e579d7 net.http.server: Don't overwrite existing response.headers when returning a response object from a HTTP handler (waqas says it's wrong) Matthew Wild <mwild1@gmail.com> parents: 5333 diff changeset	270 end
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	271 end
4683 c1374e083c97 net.http.server: Handle results returned by handlers, and send as a response. Also removes explicit firing of '', which can now be done via wildcard events. Matthew Wild <mwild1@gmail.com>* parents: 4682 diff changeset	272 end
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	273 response:send(body);
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	274 end
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	275 return;
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	276 end
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	277
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	278 -- if handler not called, return 404
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	279 response.status_code = 404;
8362 c7d6c2558a24 net.http.server: Include response object in most http-error events Kim Alvefur <zash@zash.se> parents: 7582 diff changeset	280 payload.code = 404;
c7d6c2558a24 net.http.server: Include response object in most http-error events Kim Alvefur <zash@zash.se> parents: 7582 diff changeset	281 response:send(events.fire_event("http-error", payload));
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	282 end
6071 420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	283 local function prepare_header(response)
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	284 local status_line = "HTTP/"..response.request.httpversion.." "..(response.status or codes[response.status_code]);
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	285 local headers = response.headers;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	286 local output = { status_line };
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	287 for k,v in pairs(headers) do
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	288 t_insert(output, headerfix[k]..v);
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	289 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	290 t_insert(output, "\r\n\r\n");
6071 420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	291 return output;
420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	292 end
420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	293 _M.prepare_header = prepare_header;
420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	294 function _M.send_response(response, body)
420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	295 if response.finished then return; end
420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	296 body = body or response.body or "";
6082 d0e824a21861 net.http.server: Fix some typos introduced in 420c0d3b8583. Daurnimator <quae@daurnimator.com> parents: 6071 diff changeset	297 response.headers.content_length = #body;
d0e824a21861 net.http.server: Fix some typos introduced in 420c0d3b8583. Daurnimator <quae@daurnimator.com> parents: 6071 diff changeset	298 local output = prepare_header(response);
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	299 t_insert(output, body);
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	300 response.conn:write(t_concat(output));
6082 d0e824a21861 net.http.server: Fix some typos introduced in 420c0d3b8583. Daurnimator <quae@daurnimator.com> parents: 6071 diff changeset	301 response:done();
6071 420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	302 end
7489 d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	303 function _M.send_file(response, f)
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	304 if response.finished then return; end
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	305 local chunked = not response.headers.content_length;
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	306 if chunked then response.headers.transfer_encoding = "chunked"; end
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	307 incomplete[response.conn] = response;
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	308 response._send_more = function ()
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	309 if response.finished then
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	310 incomplete[response.conn] = nil;
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	311 return;
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	312 end
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	313 local chunk = f:read(blocksize);
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	314 if chunk then
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	315 if chunked then
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	316 chunk = ("%x\r\n%s\r\n"):format(#chunk, chunk);
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	317 end
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	318 -- io.write("."); io.flush();
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	319 response.conn:write(chunk);
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	320 else
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	321 if chunked then
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	322 response.conn:write("0\r\n\r\n");
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	323 end
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	324 -- io.write("\n");
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	325 if f.close then f:close(); end
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	326 incomplete[response.conn] = nil;
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	327 return response:done();
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	328 end
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	329 end
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	330 response.conn:write(t_concat(prepare_header(response)));
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	331 return true;
d32406f27efd net.http.server: Add response method for reading response body from a file handle Kim Alvefur <zash@zash.se> parents: 7084 diff changeset	332 end
6071 420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	333 function _M.finish_response(response)
420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	334 if response.finished then return; end
420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	335 response.finished = true;
420c0d3b8583 net.http.server: Add prepare_header() and finish_response() to allow sending chunked responses via the API Daurnimator <quae@daurnimator.com> parents: 5776 diff changeset	336 response.conn._http_open_response = nil;
4691 a164fc7057ae net.http.server: Support for on_destroy callback on response objects, and a 'finished' flag to say when they are destroyed (responded to or connection closed) Matthew Wild <mwild1@gmail.com> parents: 4689 diff changeset	337 if response.on_destroy then
a164fc7057ae net.http.server: Support for on_destroy callback on response objects, and a 'finished' flag to say when they are destroyed (responded to or connection closed) Matthew Wild <mwild1@gmail.com> parents: 4689 diff changeset	338 response:on_destroy();
a164fc7057ae net.http.server: Support for on_destroy callback on response objects, and a 'finished' flag to say when they are destroyed (responded to or connection closed) Matthew Wild <mwild1@gmail.com> parents: 4689 diff changeset	339 response.on_destroy = nil;
a164fc7057ae net.http.server: Support for on_destroy callback on response objects, and a 'finished' flag to say when they are destroyed (responded to or connection closed) Matthew Wild <mwild1@gmail.com> parents: 4689 diff changeset	340 end
5300 fcb1be0b4a5c net.http.server: Properly handle persistent connections Florian Zeitz <florob@babelmonkeys.de> parents: 4788 diff changeset	341 if response.persistent then
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	342 response:finish_cb();
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	343 else
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	344 response.conn:close();
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	345 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	346 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	347 function _M.add_handler(event, handler, priority)
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	348 events.add_handler(event, handler, priority);
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	349 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	350 function _M.remove_handler(event, handler)
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	351 events.remove_handler(event, handler);
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	352 end
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	353
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	354 function _M.listen_on(port, interface, ssl)
7084 fdbe9ccac17d net.http.server: Return from listen_on() whatever net.server.addserver() returns Kim Alvefur <zash@zash.se> parents: 6963 diff changeset	355 return addserver(interface or "", port, listener, "a", ssl);
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	356 end
4736 3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	357 function _M.add_host(host)
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	358 hosts[host] = true;
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	359 end
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	360 function _M.remove_host(host)
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	361 hosts[host] = nil;
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	362 end
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	363 function _M.set_default_host(host)
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	364 default_host = host;
3514338c59c3 net.http.server, mod_http: Support http_default_host config option to specify where to direct requests for unknown HTTP vhosts Matthew Wild <mwild1@gmail.com> parents: 4735 diff changeset	365 end
5439 bd7b314c2301 net.http.server: add API to allow firing events directly on the server. Marco Cirillo <maranda@lightwitch.org> parents: 5404 diff changeset	366 function _M.fire_event(event, ...)
bd7b314c2301 net.http.server: add API to allow firing events directly on the server. Marco Cirillo <maranda@lightwitch.org> parents: 5404 diff changeset	367 return events.fire_event(event, ...);
bd7b314c2301 net.http.server: add API to allow firing events directly on the server. Marco Cirillo <maranda@lightwitch.org> parents: 5404 diff changeset	368 end
7579 d430573fe9f8 net.http.server: Expose way to set http server options Kim Alvefur <zash@zash.se> parents: 6589 diff changeset	369 function _M.set_option(name, value)
d430573fe9f8 net.http.server: Expose way to set http server options Kim Alvefur <zash@zash.se> parents: 6589 diff changeset	370 options[name] = value;
d430573fe9f8 net.http.server: Expose way to set http server options Kim Alvefur <zash@zash.se> parents: 6589 diff changeset	371 end
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	372
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	373 _M.listener = listener;
fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	374 _M.codes = codes;
4706 845393c76d17 net.http.server: Expose events object (for debug purposes) Matthew Wild <mwild1@gmail.com> parents: 4704 diff changeset	375 _M._events = events;
4631 fc5d3b053454 net.http.{server\|codes\|parser}: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	376 return _M;

prosody

39ee70fbb009

net/http/server.lua

Software / code / prosody

Annotate

net/http/server.lua @ 9751:39ee70fbb009

Software `/` code `/` prosody