diff options
author | Andrew White <andyw@pixeltrix.co.uk> | 2013-04-27 12:43:47 +0100 |
---|---|---|
committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-04-27 12:43:47 +0100 |
commit | ab08519b1aed46dbd4b3e13932bbaddfe42d8315 (patch) | |
tree | 4bf0eede0ba3bf741b2559b2cf720d3d5c39c4d0 /actionpack/lib | |
parent | 7c8caf930d1176503259e9e811ae9935caf1a7b5 (diff) | |
download | rails-ab08519b1aed46dbd4b3e13932bbaddfe42d8315.tar.gz rails-ab08519b1aed46dbd4b3e13932bbaddfe42d8315.tar.bz2 rails-ab08519b1aed46dbd4b3e13932bbaddfe42d8315.zip |
Don't reprocess the options hash on every request
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/metal/force_ssl.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb index 7edeba6fc0..b8afce42c9 100644 --- a/actionpack/lib/action_controller/metal/force_ssl.rb +++ b/actionpack/lib/action_controller/metal/force_ssl.rb @@ -61,8 +61,9 @@ module ActionController # will be called only when it returns a false value. def force_ssl(options = {}) action_options = options.slice(*ACTION_OPTIONS) + redirect_options = options.except(*ACTION_OPTIONS) before_action(action_options) do - force_ssl_redirect(options.except(*ACTION_OPTIONS)) + force_ssl_redirect(redirect_options) end end end |