From a64914de4c41473c4bfecec1c69cfc931ccb6281 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 11 Jun 2014 15:01:30 -0700 Subject: pull the port out of the options hash once --- actionpack/lib/action_dispatch/http/url.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_dispatch/http') diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb index e970d20c39..9b5257ef96 100644 --- a/actionpack/lib/action_dispatch/http/url.rb +++ b/actionpack/lib/action_dispatch/http/url.rb @@ -75,10 +75,11 @@ module ActionDispatch def build_host_url(options) protocol = options[:protocol] host = options[:host] + port = options[:port] if match = host.match(HOST_REGEXP) protocol ||= match[1] unless protocol == false host = match[2] - options[:port] = match[3] unless options.key?(:port) + port = match[3] unless options.key? :port end protocol = normalize_protocol protocol @@ -91,7 +92,7 @@ module ActionDispatch end result << host - normalize_port(options[:port], protocol) { |port| + normalize_port(port, protocol) { |port| result << ":#{port}" } -- cgit v1.2.3