diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-08-01 11:55:47 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-08-01 11:55:47 -0700 |
| commit | ea7fc2e7c0aba43b0c54309d292d982e52ee1b3d (patch) | |
| tree | af1c1de107ac0500ed6d28169cd37fc289ee8e89 /actionpack/lib/action_controller | |
| parent | 8cbcd19d7079db1b5df6ddb3b813fea57cd5cc38 (diff) | |
| download | rails-ea7fc2e7c0aba43b0c54309d292d982e52ee1b3d.tar.gz rails-ea7fc2e7c0aba43b0c54309d292d982e52ee1b3d.tar.bz2 rails-ea7fc2e7c0aba43b0c54309d292d982e52ee1b3d.zip | |
just set the host, no need for another hash allocation / merge!
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/force_ssl.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb index a2cb6d1e66..d920668184 100644 --- a/actionpack/lib/action_controller/metal/force_ssl.rb +++ b/actionpack/lib/action_controller/metal/force_ssl.rb @@ -85,7 +85,7 @@ module ActionController if host_or_options.is_a?(Hash) options.merge!(host_or_options) elsif host_or_options - options.merge!(:host => host_or_options) + options[:host] = host_or_options end secure_url = ActionDispatch::Http::URL.url_for(options.slice(*URL_OPTIONS)) |