summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-23 00:12:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-23 00:12:33 +0000
commitda861d79b701ed24aa3a4e2f303fd00096359341 (patch)
treeaaa892415958d26635cd85a321a0cebbbd806be1
parent833afaa2cc9c08b5a7ef314575301d4a9abd23a9 (diff)
* test/cgi/test_cgi_multipart.rb (CGIMultipartTest#_prepare):
always must be binary mode. c.f. Bug#2341 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/cgi/test_cgi_multipart.rb7
-rw-r--r--version.h4
3 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 274e245ebb..6378ab1727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 23 09:12:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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 <naruse@ruby-lang.org>
* 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 012f515647..717640e4f0 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 c1e2f3120e..0e995ee49e 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"