nagachika	2016-08-18 23:05:06 +0900 (Thu, 18 Aug 2016)

  New Revision: 55957

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

  Log:
    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]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/thread.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/thread.c
===================================================================
--- ruby_2_3/thread.c	(revision 55956)
+++ ruby_2_3/thread.c	(revision 55957)
@@ -3717,6 +3717,7 @@ rb_wait_for_single_fd(int fd, int events https://github.com/ruby/ruby/blob/trunk/ruby_2_3/thread.c#L3717
     fds.events = (short)events;
 
     do {
+	fds.revents = 0;
 	lerrno = 0;
 	BLOCKING_REGION({
 	    result = ppoll(&fds, 1, timeout, NULL);
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 55956)
+++ ruby_2_3/version.h	(revision 55957)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #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
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 55956)
+++ ruby_2_3/ChangeLog	(revision 55957)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Thu Aug 18 23:04:59 2016  Naohisa Goto  <ngotogenome@g...>
+
+	* 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@r...>
 
 	* vm_args.c (setup_parameters_complex): don't raise ArgumentError

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55613


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