aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-02-27 10:10:34 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-02-27 10:10:53 -0800
commit9ad7767aba737fc19496a5475083c45048210180 (patch)
tree48298f31c27a9d8ce581223f9bde3d4a53ae3c5e
parent4a631dfb12c0faef71db97703742c826b7bf8f16 (diff)
downloadrails-9ad7767aba737fc19496a5475083c45048210180.tar.gz
rails-9ad7767aba737fc19496a5475083c45048210180.tar.bz2
rails-9ad7767aba737fc19496a5475083c45048210180.zip
Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug
Binary mode window bug
-rw-r--r--activesupport/lib/active_support/core_ext/file/atomic.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/file/atomic.rb b/activesupport/lib/active_support/core_ext/file/atomic.rb
index 3645597301..fd1633ff45 100644
--- a/activesupport/lib/active_support/core_ext/file/atomic.rb
+++ b/activesupport/lib/active_support/core_ext/file/atomic.rb
@@ -16,7 +16,7 @@ class File
require 'tempfile' unless defined?(Tempfile)
require 'fileutils' unless defined?(FileUtils)
- temp_file = Tempfile.new(basename(file_name), temp_dir)
+ temp_file = Tempfile.new(basename(file_name), temp_dir, :binmode => true)
yield temp_file
temp_file.close