From ea7fc2e7c0aba43b0c54309d292d982e52ee1b3d Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Fri, 1 Aug 2014 11:55:47 -0700 Subject: just set the host, no need for another hash allocation / merge! --- actionpack/lib/action_controller/metal/force_ssl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/metal/force_ssl.rb') 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)) -- cgit v1.2.3