aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-07-16 11:35:27 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-07-16 11:35:27 -0700
commit90f0cdc906fcec77937363c87cba45f3802ac858 (patch)
treeb8988f8aa31734bc7256ea893fe4c067e7d4f111 /actionpack/lib
parenta00f547d2b83f95d169050a2b25afa196d0a9205 (diff)
downloadrails-90f0cdc906fcec77937363c87cba45f3802ac858.tar.gz
rails-90f0cdc906fcec77937363c87cba45f3802ac858.tar.bz2
rails-90f0cdc906fcec77937363c87cba45f3802ac858.zip
always transcode the file to utf-8
people may be passing filenames to the constructor that are not utf-8, but they will assome that calling `original_filename` returns utf-8 (because that's what it used to do).
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/http/upload.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/upload.rb b/actionpack/lib/action_dispatch/http/upload.rb
index 538bcfdcd7..540e11a4a0 100644
--- a/actionpack/lib/action_dispatch/http/upload.rb
+++ b/actionpack/lib/action_dispatch/http/upload.rb
@@ -28,6 +28,7 @@ module ActionDispatch
raise(ArgumentError, ':tempfile is required') unless @tempfile
@original_filename = hash[:filename]
+ @original_filename &&= @original_filename.encode "UTF-8"
@content_type = hash[:type]
@headers = hash[:head]
end