aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorFelipe Talavera <felipe.talavera@gmail.com>2009-08-09 16:56:18 +0100
committerPratik Naik <pratiknaik@gmail.com>2009-08-09 16:56:18 +0100
commit654568e71b1ee36a04acef74b1a8ce4737050882 (patch)
treee4fb7e293ddb2590804b8ba02c955f8c1c2d8681 /actionpack/lib/action_controller/metal
parent7dbb2b6f83c5a1a5f4ef0a97fee5322957977306 (diff)
downloadrails-654568e71b1ee36a04acef74b1a8ce4737050882.tar.gz
rails-654568e71b1ee36a04acef74b1a8ce4737050882.tar.bz2
rails-654568e71b1ee36a04acef74b1a8ce4737050882.zip
Allow to configure trusted proxies via ActionController::Base.trusted_proxies [#2126 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 23e7b1b3af..f94d1c669c 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -64,6 +64,8 @@ module ActionController
cattr_accessor :ip_spoofing_check
self.ip_spoofing_check = true
+
+ cattr_accessor :trusted_proxies
end
# For old tests