# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1613646131 -3600
# Node ID a0477656258c6878d7a2f6413d45f941b3b2bc4a
# Parent  9a1758c5aaa4e7dd435b4a0fcdb2f8edad90c6b6# Parent  8603011e51fea361f50c179f5a9ecca4d6ea50d9
Merge 0.11->trunk

diff -r 9a1758c5aaa4 -r a0477656258c plugins/mod_http.lua
--- a/plugins/mod_http.lua	Tue Feb 16 23:10:23 2021 +0100
+++ b/plugins/mod_http.lua	Thu Feb 18 12:02:11 2021 +0100
@@ -256,7 +256,7 @@
 
 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