Merge branch 'master' into loofah

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/test/controller/integration_test.rb
	actionview/CHANGELOG.md

1 files changed, 2 insertions, 8 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