diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-12 14:55:00 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-08-12 14:55:00 +0000 |
commit | 388215e32396b1a67bab2849951f48ffc68dfb19 (patch) | |
tree | 9b0def0ce8951302c2b23f0bdadfacdd3cf7dc0c /ChangeLog | |
parent | 3a78ff203c628b9a5a9edb2794e2910600cff723 (diff) |
merge revision(s) 51202,51203,51204: [Backport #11340]
* win32/win32.c (waitpid): return immediately if interrupted.
reported by <takkanm AT gmail.com> [ruby-dev:49176] [Bug #11340]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Wed Aug 12 23:53:39 2015 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (waitpid): return immediately if interrupted. + reported by <takkanm AT gmail.com> [ruby-dev:49176] [Bug #11340] + Wed Aug 12 01:05:58 2015 Jeremy Evans <merch-redmine@jeremyevans.net> * test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised |