ruby-changes:46501
From: nagachika <ko1@a...>
Date: Tue, 9 May 2017 23:21:43 +0900 (JST)
Subject: [ruby-changes:46501] nagachika:r58622 (ruby_2_4): merge revision(s) 58534: [Backport #13533]
nagachika 2017-05-09 23:21:37 +0900 (Tue, 09 May 2017) New Revision: 58622 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58622 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_4/ Modified files: branches/ruby_2_4/io.c branches/ruby_2_4/version.h Index: ruby_2_4/io.c =================================================================== --- ruby_2_4/io.c (revision 58621) +++ ruby_2_4/io.c (revision 58622) @@ -10208,7 +10208,7 @@ nogvl_wait_for_single_fd(int fd, short e https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L10208 fds.fd = fd; fds.events = events; - return poll(&fds, 1, 0); + return poll(&fds, 1, -1); } static int Index: ruby_2_4/version.h =================================================================== --- ruby_2_4/version.h (revision 58621) +++ ruby_2_4/version.h (revision 58622) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1 #define RUBY_VERSION "2.4.2" #define RUBY_RELEASE_DATE "2017-05-09" -#define RUBY_PATCHLEVEL 116 +#define RUBY_PATCHLEVEL 117 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 5 Index: ruby_2_4 =================================================================== --- ruby_2_4 (revision 58621) +++ ruby_2_4 (revision 58622) Property changes on: ruby_2_4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r58534 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/