mirror of
https://github.com/bjc/prosody.git
synced 2025-04-04 21:57:45 +03:00
Merge 0.11->trunk
This commit is contained in:
commit
4b4636ae65
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue