only extract domain from the options hash once

1 files changed, 4 insertions, 3 deletions

diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index fd310d5219..0aa7e3433e 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -124,18 +124,19 @@ module ActionDispatch
           return _host unless named_host?(_host)
 
           tld_length = options[:tld_length] || @@tld_length
+          subdomain  = options[:subdomain]
+          domain     = options[:domain]
 
           host = ""
-          subdomain = options[:subdomain]
           if subdomain == true || !options.key?(:subdomain)
-            return _host if options[:domain].nil?
+            return _host if domain.nil?
 
             host << extract_subdomain(_host, tld_length)
           elsif subdomain
             host << subdomain.to_param
           end
           host << "." unless host.empty?
-          host << (options[:domain] || extract_domain_from(_host, tld_length))
+          host << (domain || extract_domain_from(_host, tld_length))
           host
         end