merge revision(s) 55613: [Backport #12575]

	* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time
	  before calling ppoll(2). [Bug #12575] [ruby-dev:49725]


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

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 039fcbc00d..47c24328bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 18 23:04:59 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time
+	  before calling ppoll(2). [Bug #12575] [ruby-dev:49725]
+
 Thu Aug 18 22:52:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* vm_args.c (setup_parameters_complex): don't raise ArgumentError
diff --git a/thread.c b/thread.c
index a0e31c5326..4fadbd91aa 100644
--- a/thread.c
+++ b/thread.c
@@ -3717,6 +3717,7 @@ rb_wait_for_single_fd(int fd, int events, struct timeval *tv)
     fds.events = (short)events;
 
     do {
+	fds.revents = 0;
 	lerrno = 0;
 	BLOCKING_REGION({
 	    result = ppoll(&fds, 1, timeout, NULL);
diff --git a/version.h b/version.h
index 4984fd9036..66b6aa6a06 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.2"
 #define RUBY_RELEASE_DATE "2016-08-18"
-#define RUBY_PATCHLEVEL 168
+#define RUBY_PATCHLEVEL 169
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8