From 9bff2dd7bbca10d94b56cdbb76e2af55dfb2b2ca Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 30 Jun 2017 10:40:59 +0000 Subject: 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ io.c | 2 +- version.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4412e72e9a..ed76e7e07c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Jun 30 19:37:47 2017 KOSAKI Motohiro + + * 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 * class.c (Init_class_hierarchy): prevent rb_cObject which is the class diff --git a/io.c b/io.c index 72fbff3e3b..aeea680652 100644 --- a/io.c +++ b/io.c @@ -10136,7 +10136,7 @@ nogvl_wait_for_single_fd(int fd, short events) fds.fd = fd; fds.events = events; - return poll(&fds, 1, 0); + return poll(&fds, 1, -1); } static int diff --git a/version.h b/version.h index 9e525d30b4..33d2f8dab6 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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 -- cgit v1.2.3