merge revision(s) 57948,57950: [Backport #13304]

	thread.c: rb_thread_fd_close [ci skip]

	* thread.c (rb_thread_fd_close): re-define only for abi-check,
	  abort if called.  [ruby-core:80078] [Bug #13304]
	thread.c: rb_thread_fd_close [ci skip]

	* thread.c (rb_thread_fd_close): remove deprecated. a couple of
	  external libraries used it.  [ruby-core:80078] [Bug #13304]

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

2 files changed, 7 insertions, 1 deletions

diff --git a/thread.c b/thread.c
index ee75ec39ee..e080e161b2 100644
--- a/thread.c
+++ b/thread.c
@@ -2193,6 +2193,12 @@ rb_notify_fd_close(int fd)
     return busy;
 }
 
+void
+rb_thread_fd_close(int fd)
+{
+    while (rb_notify_fd_close(fd));
+}
+
 /*
  *  call-seq:
  *     thr.raise
diff --git a/version.h b/version.h
index c074da87e9..22b946b305 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-13"
-#define RUBY_PATCHLEVEL 101
+#define RUBY_PATCHLEVEL 102
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3