diff options
| author | Matthew Wild <mwild1@gmail.com> | 2017-07-28 23:47:38 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2017-07-28 23:47:38 +0100 |
| commit | ab793182e77752bd08cf0347a95298312693563b (patch) | |
| tree | 3d0d78194ab5828d67c07bac2f07209054155de9 /plugins | |
| parent | aca11d8afe0573dd1573356bd14edd4bb823a187 (diff) | |
| parent | 8049a9c15fdbf78f0284240ef532e90228e6d4ad (diff) | |
| download | prosody-ab793182e77752bd08cf0347a95298312693563b.tar.gz prosody-ab793182e77752bd08cf0347a95298312693563b.zip | |
Merge 0.10 -> trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_bosh.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_register.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua index c2809143..cc591be7 100644 --- a/plugins/mod_bosh.lua +++ b/plugins/mod_bosh.lua @@ -49,7 +49,7 @@ local cross_domain = module:get_option("cross_domain_bosh", false); 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(); diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua index e999428d..fd5339d9 100644 --- a/plugins/mod_register.lua +++ b/plugins/mod_register.lua @@ -182,7 +182,7 @@ end local min_seconds_between_registrations = module:get_option_number("min_seconds_between_registrations"); local whitelist_only = module:get_option_boolean("whitelist_registration_only"); -local whitelisted_ips = module:get_option_set("registration_whitelist", { "127.0.0.1" })._items; +local whitelisted_ips = module:get_option_set("registration_whitelist", { "127.0.0.1", "::1" })._items; local blacklisted_ips = module:get_option_set("registration_blacklist", {})._items; local throttle_max = module:get_option_number("registration_throttle_max", min_seconds_between_registrations and 1); |