aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
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:34 -0800
commitb543f8f88cb762d0dd3d83ee1d12574db453c697 (patch)
treef4e6e0e89fd1639bd832e4f1a25b31f2b47b2c9e /activesupport
parent663904f869bbca6b88bfe4b9906afbbffea1a0ff (diff)
parent06dc8ed28900246436003bf32dc2579af12f4846 (diff)
downloadrails-b543f8f88cb762d0dd3d83ee1d12574db453c697.tar.gz
rails-b543f8f88cb762d0dd3d83ee1d12574db453c697.tar.bz2
rails-b543f8f88cb762d0dd3d83ee1d12574db453c697.zip
Merge pull request #5179 from RalphShnelvar/Binary_mode_Window_bug
Binary mode window bug
Diffstat (limited to 'activesupport')
-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