mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-21 20:15:10 +01:00
Code Issues Projects Releases Wiki Activity

Fix error

Browse Source
This commit is contained in:
Eugen 2017-01-22 23:07:31 +01:00 committed by GitHub
parent cea9fb31fe
commit 956da43e19
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/initializers/trusted_proxies.rb
View File

@ -1,7 +1,11 @@
module Rack module Rack
class Request class Request
def trusted_proxy?(ip) def trusted_proxy?(ip)
Rails.application.config.action_dispatch.trusted_proxies.any? { |proxy| proxy === ip } if Rails.application.config.action_dispatch.trusted_proxies.nil?
super
else
Rails.application.config.action_dispatch.trusted_proxies.any? { |proxy| proxy === ip }
end
end end
end end
end end