TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

cache protocol on the stack to reduce options hash lookups

Browse Source
This commit is contained in:
Aaron Patterson 2014-06-11 11:36:50 -07:00
parent 1c432d1af1
commit aaaff369da
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
actionpack/lib/action_dispatch/http/url.rb
View File

@ -79,17 +79,17 @@ def build_host_url(options)
options[:port] = match[3] unless options.key?(:port)
end
options[:protocol] = normalize_protocol(options)
options[:host] = normalize_host(options)
protocol = normalize_protocol options[:protocol]
options[:host] = normalize_host(options)
result = options[:protocol].dup
result = protocol.dup
if options[:user] && options[:password]
result << "#{Rack::Utils.escape(options[:user])}:#{Rack::Utils.escape(options[:password])}@"
end
result << options[:host]
normalize_port(options[:port], options[:protocol]) { |port|
normalize_port(options[:port], protocol) { |port|
result << ":#{port}"
}
@ -104,8 +104,8 @@ def same_host?(options)
(options[:subdomain] == true || !options.key?(:subdomain)) && options[:domain].nil?
end
def normalize_protocol(options)
case options[:protocol]
def normalize_protocol(protocol)
case protocol
when nil
"http://"
when false, "//"
@ -113,7 +113,7 @@ def normalize_protocol(options)
when PROTOCOL_REGEXP
"#{$1}://"
else
raise ArgumentError, "Invalid :protocol option: #{options[:protocol].inspect}"
raise ArgumentError, "Invalid :protocol option: #{protocol.inspect}"
end
end