From 71a31e48480c578a92b6cd9985106674edf92009 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 23 Dec 2009 00:12:33 +0000 Subject: * test/cgi/test_cgi_multipart.rb (CGIMultipartTest#_prepare): always must be binary mode. c.f. Bug#2341 git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/cgi/test_cgi_multipart.rb | 7 ++----- version.h | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 274e245eb..6378ab172 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 23 09:12:31 2009 Nobuyoshi Nakada + + * test/cgi/test_cgi_multipart.rb (CGIMultipartTest#_prepare): + always must be binary mode. c.f. Bug#2341 + Thu Dec 10 09:20:58 2009 NARUSE, Yui * encoding.c (Init_Encoding): undef Encoding.new because diff --git a/test/cgi/test_cgi_multipart.rb b/test/cgi/test_cgi_multipart.rb index 012f51564..717640e4f 100644 --- a/test/cgi/test_cgi_multipart.rb +++ b/test/cgi/test_cgi_multipart.rb @@ -135,11 +135,8 @@ class CGIMultipartTest < Test::Unit::TestCase ENV['CONTENT_LENGTH'] = input.length.to_s ENV['REQUEST_METHOD'] = 'POST' ## set $stdin - tmpfile = if RUBY_VERSION >="1.9" - Tempfile.new('test_cgi_multipart', :binmode => true) - else - Tempfile.new('test_cgi_multipart') - end + tmpfile = Tempfile.new('test_cgi_multipart') + tmpfile.binmode tmpfile << input tmpfile.rewind() $stdin = tmpfile diff --git a/version.h b/version.h index c1e2f3120..0e995ee49 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-12-22" +#define RUBY_RELEASE_DATE "2009-12-23" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 23 #include "ruby/version.h" -- cgit