merges r24752 from trunk into ruby_1_9_1.

--
* test/ruby/test_io.rb (test_binmode_after_closed): test for [ruby-core:25363].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 1 deletions

diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 04c0b55533..3550162aa9 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -1374,4 +1374,10 @@ class TestIO < Test::Unit::TestCase
     assert(File.read(t.path, 4).tainted?, '[ruby-dev:38826]')
     assert(File.open(t.path) {|f| f.read(4)}.tainted?, '[ruby-dev:38826]')
   end
+
+  def test_binmode_after_closed
+    t = make_tempfile
+    t.close
+    assert_raise(IOError) {t.binmode}
+  end
 end
diff --git a/version.h b/version.h
index 1e80442477..a0c7ed0dc3 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 313
+#define RUBY_PATCHLEVEL 314
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1