diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-09 14:21:37 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-09 14:21:37 +0000 |
commit | 53b976efa0d49896341bcca0b17a636eb67bd54d (patch) | |
tree | f0a13f254fe92737b4b3934b4948b9253f7ee28e | |
parent | 881bee60d0781b2b4d842aaa3bc2c5a3b04c108f (diff) |
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_4@58622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | io.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -10208,7 +10208,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 @@ -1,6 +1,6 @@ #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 |