usa	2016-08-16 13:43:40 +0900 (Tue, 16 Aug 2016)

  New Revision: 55924

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

  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_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/thread.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 55923)
+++ ruby_2_2/ChangeLog	(revision 55924)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Aug 16 13:42:42 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]
+
 Tue Aug 16 13:40:26 2016  Eric Wong  <e@8...>
 
 	* lib/webrick/httpservlet/cgihandler.rb (do_GET): delete HTTP_PROXY
Index: ruby_2_2/thread.c
===================================================================
--- ruby_2_2/thread.c	(revision 55923)
+++ ruby_2_2/thread.c	(revision 55924)
@@ -3620,6 +3620,7 @@ rb_wait_for_single_fd(int fd, int events https://github.com/ruby/ruby/blob/trunk/ruby_2_2/thread.c#L3620
     fds.events = (short)events;
 
 retry:
+    fds.revents = 0;
     lerrno = 0;
     BLOCKING_REGION({
 	result = ppoll(&fds, 1, timeout, NULL);
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 55923)
+++ ruby_2_2/version.h	(revision 55924)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-08-16"
-#define RUBY_PATCHLEVEL 352
+#define RUBY_PATCHLEVEL 353
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8

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


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