From 255955585c922ec5e303df184057b7781fcee345 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 15 Jan 2015 15:26:03 +0000
Subject: [PATCH] * io.c (rb_io_close_m): Don't raise when the IO object is
 closed.   [ruby-core:67444] [Feature #10718]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                       |  5 +++++
 io.c                            |  7 +++++++
 test/ruby/test_io.rb            | 13 +++++++++++++
 test/socket/test_basicsocket.rb |  2 +-
 test/zlib/test_zlib.rb          |  2 +-
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e4bb457a9..c9a1855f34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 15 23:55:15 2015  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_close_m): Don't raise when the IO object is closed.
+	  [ruby-core:67444] [Feature #10718]
+
 Thu Jan 15 21:34:57 2015  Seiei Higa  <hanachin@gmail.com>
 
 	* proc.c (rb_obj_singleton_method): Kernel#singleton_method should
diff --git a/io.c b/io.c
index c9849715c0..c99f0c2a7e 100644
--- a/io.c
+++ b/io.c
@@ -4415,11 +4415,18 @@ rb_io_close(VALUE io)
  *
  *  If <em>ios</em> is opened by <code>IO.popen</code>,
  *  <code>close</code> sets <code>$?</code>.
+ *
+ *  Calling this method on closed IO object is just ignored since Ruby 2.3.
  */
 
 static VALUE
 rb_io_close_m(VALUE io)
 {
+    rb_io_t *fptr = RFILE(io)->fptr;
+    rb_io_check_initialized(fptr);
+    if (fptr->fd < 0) {
+        return Qnil;
+    }
     rb_io_check_closed(RFILE(io)->fptr);
     rb_io_close(io);
     return Qnil;
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 935ee24d83..7161be1a6e 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -3159,4 +3159,17 @@ End
       end
     end
   end
+
+  def test_close_twice
+    open(__FILE__) {|f|
+      assert_equal(nil, f.close)
+      assert_equal(nil, f.close)
+    }
+  end
+
+  def test_close_uninitialized
+    io = IO.allocate
+    assert_raise(IOError) { io.close } 
+  end
+
 end
diff --git a/test/socket/test_basicsocket.rb b/test/socket/test_basicsocket.rb
index c37f312984..da977b3be0 100644
--- a/test/socket/test_basicsocket.rb
+++ b/test/socket/test_basicsocket.rb
@@ -9,7 +9,7 @@ class TestSocket_BasicSocket < Test::Unit::TestCase
     sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
     yield sock
   ensure
-    assert_raise(IOError) {sock.close}
+    assert(sock.closed?)
   end
 
   def test_getsockopt
diff --git a/test/zlib/test_zlib.rb b/test/zlib/test_zlib.rb
index a7fa943c7a..3a2fe9274d 100644
--- a/test/zlib/test_zlib.rb
+++ b/test/zlib/test_zlib.rb
@@ -929,7 +929,7 @@ if defined? Zlib
         f = open(t.path)
         f.binmode
         assert_equal("foo", Zlib::GzipReader.wrap(f) {|gz| gz.read })
-        assert_raise(IOError) { f.close }
+        assert(f.closed?)
       }
     end