From 654568e71b1ee36a04acef74b1a8ce4737050882 Mon Sep 17 00:00:00 2001
From: Felipe Talavera <felipe.talavera@gmail.com>
Date: Sun, 9 Aug 2009 16:56:18 +0100
Subject: Allow to configure trusted proxies via
 ActionController::Base.trusted_proxies [#2126 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
---
 actionpack/lib/action_controller/metal/compatibility.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'actionpack/lib/action_controller/metal')

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
-- 
cgit v1.2.3