From b9a2fab79fff8bb3d51feff1e5305815bc1e6797 Mon Sep 17 00:00:00 2001 From: Nate Kidwell Date: Mon, 19 Jul 2010 12:44:12 -0400 Subject: [PATCH] made deprecated trusted_proxy method delegate appropriately [#5151 state:resolved] --- .../lib/action_controller/deprecated/base.rb | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actionpack/lib/action_controller/deprecated/base.rb b/actionpack/lib/action_controller/deprecated/base.rb index 3975afc..fbe9e4f 100644 --- a/actionpack/lib/action_controller/deprecated/base.rb +++ b/actionpack/lib/action_controller/deprecated/base.rb @@ -61,13 +61,13 @@ module ActionController def trusted_proxies=(value) ActiveSupport::Deprecation.warn "ActionController::Base.trusted_proxies= is deprecated. " << "Please configure it on your application with config.action_dispatch.trusted_proxies=", caller - Rails.application.config.action_dispatch.ip_spoofing_check = value + Rails.application.config.action_dispatch.trusted_proxies = value end def trusted_proxies ActiveSupport::Deprecation.warn "ActionController::Base.trusted_proxies is deprecated. " << "Configuring trusted_proxies on the application configures a middleware.", caller - Rails.application.config.action_dispatch.ip_spoofing_check = value + Rails.application.config.action_dispatch.trusted_proxies end def session(*args) -- 1.6.2.2