prosody
e89320b8a789
plugins/mod_bosh.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

plugins/mod_bosh.lua @ 8185:e89320b8a789

Merge 0.10 -> trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 28 Jul 2017 23:47:38 +0100
parent 8101:3e25d96571d1
parent 8182:048a83433295
child 8489:fc8ef0943b60
line wrap: on
line diff
--- a/plugins/mod_bosh.lua	Thu Jul 06 11:24:36 2017 +0200
+++ b/plugins/mod_bosh.lua	Fri Jul 28 23:47:38 2017 +0100
@@ -49,7 +49,7 @@
 if cross_domain == true then cross_domain = "*"; end
 if type(cross_domain) == "table" then cross_domain = table.concat(cross_domain, ", "); end
 
-local trusted_proxies = module:get_option_set("trusted_proxies", {"127.0.0.1"})._items;
+local trusted_proxies = module:get_option_set("trusted_proxies", { "127.0.0.1", "::1" })._items;
 
 local function get_ip_from_request(request)
 	local ip = request.conn:ip();