kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

pull the port out of the options hash once

Browse source
This commit is contained in:
Aaron Patterson 2014-06-11 15:01:30 -07:00
parent ed37698596
commit a64914de4c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
actionpack/lib/action_dispatch/http/url.rb
View file

@ -75,10 +75,11 @@ module ActionDispatch
def build_host_url(options) def build_host_url(options)
protocol = options[:protocol] protocol = options[:protocol]
host = options[:host] host = options[:host]
port = options[:port]
if match = host.match(HOST_REGEXP) if match = host.match(HOST_REGEXP)
protocol ||= match[1] unless protocol == false protocol ||= match[1] unless protocol == false
host = match[2] host = match[2]
options[:port] = match[3] unless options.key?(:port) port = match[3] unless options.key? :port
end end
protocol = normalize_protocol protocol protocol = normalize_protocol protocol
@ -91,7 +92,7 @@ module ActionDispatch
end end
result << host result << host
normalize_port(options[:port], protocol) { |port| normalize_port(port, protocol) { |port|
result << ":#{port}" result << ":#{port}"
} }