summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/http.rb1
-rw-r--r--test/net/http/test_http.rb1
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index eae991dc16..aab2063ee9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 14 13:04:16 2010 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/net/http.rb (Net::HTTPRequest#send_request_body_data):
+ set binmode to tempfile.
+
Tue Dec 14 12:55:46 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* test/zlib/test_zlib.rb (*): should close files associated with zlib.
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 6a86dbaba7..cc0a0b20dc 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1935,6 +1935,7 @@ module Net #:nodoc:
else
require 'tempfile'
file = Tempfile.new('multipart')
+ file.binmode
encode_multipart_form_data(file, params, opt)
file.rewind
self.content_length = file.size
diff --git a/test/net/http/test_http.rb b/test/net/http/test_http.rb
index a2ce962573..5e5cdab9ff 100644
--- a/test/net/http/test_http.rb
+++ b/test/net/http/test_http.rb
@@ -354,6 +354,7 @@ __EOM__
def test_set_form_with_file
require 'tempfile'
file = Tempfile.new('ruby-test')
+ file.binmode
file << $test_net_http_data
filename = File.basename(file.to_path)
data = [['file', file]]