aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorBryan Ash <bryan.a.ash@gmail.com>2009-01-13 14:42:43 -0600
committerJoshua Peek <josh@joshpeek.com>2009-01-13 14:42:43 -0600
commit5a43908c7414996354ca427354d98d789e0210e7 (patch)
treeb198bd8b488d2da4e63e2b245056ddd5c15c5c3f /actionpack/lib/action_controller
parentd3107ce3b04a14bd5674da6812acbff30aedaf73 (diff)
downloadrails-5a43908c7414996354ca427354d98d789e0210e7.tar.gz
rails-5a43908c7414996354ca427354d98d789e0210e7.tar.bz2
rails-5a43908c7414996354ca427354d98d789e0210e7.zip
Explicitly read as binary in multipart_body for Windows [#1065 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/integration.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index 08b54658ee..5b08e30d49 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -431,7 +431,7 @@ module ActionController
def multipart_body(params, boundary)
multipart_requestify(params).map do |key, value|
if value.respond_to?(:original_filename)
- File.open(value.path) do |f|
+ File.open(value.path, "rb") do |f|
f.set_encoding(Encoding::BINARY) if f.respond_to?(:set_encoding)
<<-EOF