Merge 0.11->trunk

This commit is contained in:
Kim Alvefur 2021-02-18 12:02:11 +01:00
commit 4b4636ae65

View file

@ -256,7 +256,7 @@ end
module:wrap_object_event(server._events, false, function (handlers, event_name, event_data)
local request = event_data.request;
if request then
if request and is_trusted_proxy(request.conn:ip()) then
-- Not included in eg http-error events
request.ip = get_ip_from_request(request);
end