1 files changed, 26 insertions, 31 deletions
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index c9860af909..a6c17f50a5 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -30,19 +30,25 @@ module ActionDispatch
         end
 
         def url_for(options)
+          unless options[:host] || options[:only_path]
+            raise ArgumentError, 'Missing host to link to! Please provide the :host parameter, set default_url_options[:host], or set :only_path to true'
+          end
+
           path  = options[:script_name].to_s.chomp("/")
           path << options[:path].to_s
 
-          result = build_host_url(options)
-
           if options[:trailing_slash]
             if path.include?('?')
-              result << path.sub(/\?/, '/\&')
+              path.sub!(/\?/, '/\&')
             else
-              result << path.sub(/[^\/]\z|\A\z/, '\&/')
+              path.sub!(/[^\/]\z|\A\z/, '\&/')
             end
-          else
-            result << path
+          end
+
+          result = path
+
+          unless options[:only_path]
+            result.prepend build_host_url(options)
           end
 
           if options.key? :params
@@ -61,28 +67,25 @@ module ActionDispatch
         private
 
         def build_host_url(options)
-          unless options[:host] || options[:only_path]
-            raise ArgumentError, 'Missing host to link to! Please provide the :host parameter, set default_url_options[:host], or set :only_path to true'
+          if match = options[:host].match(HOST_REGEXP)
+            options[:protocol] ||= match[1] unless options[:protocol] == false
+            options[:host]       = match[2]
+            options[:port]       = match[3] unless options.key?(:port)
           end
 
-          result = ""
+          options[:protocol] = normalize_protocol(options)
+          options[:host]     = normalize_host(options)
+          options[:port]     = normalize_port(options)
 
-          unless options[:only_path]
-            if match = options[:host].match(HOST_REGEXP)
-              options[:protocol] ||= match[1] unless options[:protocol] == false
-              options[:host]       = match[2]
-              options[:port]       = match[3] unless options.key?(:port)
-            end
-
-            options[:protocol] = normalize_protocol(options)
-            options[:host]     = normalize_host(options)
-            options[:port]     = normalize_port(options)
+          result = options[:protocol]
 
-            result << options[:protocol]
-            result << rewrite_authentication(options)
-            result << options[:host]
-            result << ":#{options[:port]}" if options[:port]
+          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]
+
           result
         end
 
@@ -94,14 +97,6 @@ module ActionDispatch
           (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