usa	2017-06-30 19:40:59 +0900 (Fri, 30 Jun 2017)

  New Revision: 59216

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59216

  Log:
    merge revision(s) 58534: [Backport #13533]
    
    nogvl_wait_for_single_fd must wait as its name
    
    poll(fds, n, 0) mean no timeout and immediately return. If you want to
    wait something, you need to use -1 instead.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/io.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 59215)
+++ ruby_2_3/version.h	(revision 59216)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.5"
 #define RUBY_RELEASE_DATE "2017-06-30"
-#define RUBY_PATCHLEVEL 312
+#define RUBY_PATCHLEVEL 313
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 6
Index: ruby_2_3/io.c
===================================================================
--- ruby_2_3/io.c	(revision 59215)
+++ ruby_2_3/io.c	(revision 59216)
@@ -10136,7 +10136,7 @@ nogvl_wait_for_single_fd(int fd, short e https://github.com/ruby/ruby/blob/trunk/ruby_2_3/io.c#L10136
     fds.fd = fd;
     fds.events = events;
 
-    return poll(&fds, 1, 0);
+    return poll(&fds, 1, -1);
 }
 
 static int
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 59215)
+++ ruby_2_3/ChangeLog	(revision 59216)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Fri Jun 30 19:37:47 2017  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* io.c (nogvl_wait_for_single_fd): nogvl_wait_for_single_fd must wait
+	  as its name.
+	  poll(fds, n, 0) mean no timeout and immediately return. If you want to
+	  wait something, you need to use -1 instead.
+
 Fri Jun 30 19:35:31 2017  Nobuyoshi Nakada  <nobu@r...>
 
 	* class.c (Init_class_hierarchy): prevent rb_cObject which is the class
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 59215)
+++ ruby_2_3	(revision 59216)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r58534

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/