提交 56b12140 编写于 作者: J José Valim

Speed up subdomain and domain calculus.

上级 2fe43b69
......@@ -570,22 +570,14 @@ def host_from_options(options)
end
def subdomain_and_domain(options)
return nil unless options[:subdomain] || options[:domain]
tld_length = options[:tld_length] || ActionDispatch::Http::URL.tld_length
current_domain = ActionDispatch::Http::URL.extract_domain(options[:host], tld_length)
current_subdomain = ActionDispatch::Http::URL.extract_subdomain(options[:host], tld_length)
domain_parts = if options[:subdomain] && options[:domain]
[options[:subdomain], options[:domain]]
elsif options[:subdomain]
[options[:subdomain], current_domain]
elsif options[:domain]
[current_subdomain, options[:domain]]
else
nil
end
domain_parts ? domain_parts.join('.') : nil
host = ""
host << (options[:subdomain] || ActionDispatch::Http::URL.extract_subdomain(options[:host], tld_length))
host << "."
host << (options[:domain] || ActionDispatch::Http::URL.extract_domain(options[:host], tld_length))
host
end
def handle_positional_args(options)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册