2 files changed, 35 insertions, 27 deletions
diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb
index 45bf751d09..540e11a4a0 100644
--- a/actionpack/lib/action_dispatch/http/upload.rb
+++ b/actionpack/lib/action_dispatch/http/upload.rb
@@ -27,7 +27,8 @@ module ActionDispatch
         @tempfile          = hash[:tempfile]
         raise(ArgumentError, ':tempfile is required') unless @tempfile
 
-        @original_filename = encode_filename(hash[:filename])
+        @original_filename = hash[:filename]
+        @original_filename &&= @original_filename.encode "UTF-8"
         @content_type      = hash[:type]
         @headers           = hash[:head]
       end
@@ -66,13 +67,6 @@ module ActionDispatch
       def eof?
         @tempfile.eof?
       end
-
-      private
-
-      def encode_filename(filename)
-        # Encode the filename in the utf8 encoding, unless it is nil
-        filename.force_encoding(Encoding::UTF_8).encode! if filename
-      end
     end
   end
 end
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
index 6ba2820d09..473f692b05 100644
--- a/actionpack/lib/action_dispatch/http/url.rb
+++ b/actionpack/lib/action_dispatch/http/url.rb
@@ -29,39 +29,53 @@ module ActionDispatch
         end
 
         def url_for(options)
-          host = options[:host]
-          unless host || options[:only_path]
+          if options[:only_path]
+            path_for options
+          else
+            full_url_for options
+          end
+        end
+
+        def full_url_for(options)
+          host     = options[:host]
+          protocol = options[:protocol]
+          port     = options[:port]
+
+          unless host
             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
+          build_host_url(host, port, protocol, options, path_for(options))
+        end
+
+        def path_for(options)
+          result  = options[:script_name].to_s.chomp("/")
+          result << options[:path].to_s
 
-          path = add_trailing_slash(path) if options[:trailing_slash]
+          result = add_trailing_slash(result) if options[:trailing_slash]
 
-          result = if options[:only_path]
-                     path
-                   else
-                     protocol = options[:protocol]
-                     port     = options[:port]
-                     build_host_url(host, port, protocol, options).concat path
-                   end
+          result = add_params options, result
+          add_anchor options, result
+        end
 
+        private
+
+        def add_params(options, result)
           if options.key? :params
-            params = options[:params].is_a?(Hash) ?
-                                 options[:params] :
-                                 { params: options[:params] }
+            param  = options[:params]
+            params = param.is_a?(Hash) ? param : { params: param }
 
             params.reject! { |_,v| v.to_param.nil? }
             result << "?#{params.to_query}" unless params.empty?
           end
+          result
+        end
 
+        def add_anchor(options, result)
           result << "##{Journey::Router::Utils.escape_fragment(options[:anchor].to_param.to_s)}" if options[:anchor]
           result
         end
 
-        private
-
         def extract_domain_from(host, tld_length)
           host.split('.').last(1 + tld_length).join('.')
         end
@@ -83,7 +97,7 @@ module ActionDispatch
           path
         end
 
-        def build_host_url(host, port, protocol, options)
+        def build_host_url(host, port, protocol, options, path)
           if match = host.match(HOST_REGEXP)
             protocol           ||= match[1] unless protocol == false
             host                 = match[2]
@@ -104,7 +118,7 @@ module ActionDispatch
             result << ":#{normalized_port}"
           }
 
-          result
+          result.concat path
         end
 
         def named_host?(host)