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

fewer method calls and string garbage when there is no user/password

Browse Source
This commit is contained in:
Aaron Patterson 2014-05-20 15:20:16 -07:00
parent 5e181ed0ae
commit 6004c753fe
1 changed files with 5 additions and 9 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,7 +79,11 @@ def build_host_url(options)
options[:port] = normalize_port(options)
result << options[:protocol]
result << rewrite_authentication(options)
if options[:user] && options[:password]
result << "#{Rack::Utils.escape(options[:user])}:#{Rack::Utils.escape(options[:password])}@"
end
result << options[:host]
result << ":#{options[:port]}" if options[:port]
end
@ -94,14 +98,6 @@ def same_host?(options)
(options[:subdomain] == true || !options.key?(:subdomain)) && options[:domain].nil?
end
def rewrite_authentication(options)
if options[:user] && options[:password]
"#{Rack::Utils.escape(options[:user])}:#{Rack::Utils.escape(options[:password])}@"
else
""
end
end
def normalize_protocol(options)
case options[:protocol]
when nil