From 8e105a55383a3c94dfe3507c37b79a5e4fe85276 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 15 Jul 2014 15:31:31 -0700 Subject: rack 1.6 encodes the filenames in posts correctly now --- actionpack/lib/action_dispatch/http/upload.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'actionpack/lib/action_dispatch') diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb index 45bf751d09..538bcfdcd7 100644 --- a/actionpack/lib/action_dispatch/http/upload.rb +++ b/actionpack/lib/action_dispatch/http/upload.rb @@ -27,7 +27,7 @@ module ActionDispatch @tempfile = hash[:tempfile] raise(ArgumentError, ':tempfile is required') unless @tempfile - @original_filename = encode_filename(hash[:filename]) + @original_filename = hash[:filename] @content_type = hash[:type] @headers = hash[:head] end @@ -66,13 +66,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 -- cgit v1.2.3