diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-18 15:07:24 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-18 15:07:24 +0000 |
commit | 541f4f250276c1f999c651a6f5699565e77d850b (patch) | |
tree | 69f8d37e5133728874696a77f1767f03dd60145f /ChangeLog | |
parent | bec19f4962ab3ef773f016761e1761ddf516e0b9 (diff) |
merge revision(s) 60055: [Backport #13856]
io.c: fix segfault with closing socket on Windows
* io.c (fptr_finalize_flush): add an argument to keep GVL.
* io.c (fptr_finalize): adjust for above change.
* io.c (io_close_fptr): closing without GVL causes another
exception while raising exception in another thread. This causes
segfault on Windows. Keep GVL while closing when another thread
raises.
[Bug #13856] [ruby-core:82602]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,16 @@ +Mon Mar 19 00:06:43 2018 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + io.c: fix segfault with closing socket on Windows + + * io.c (fptr_finalize_flush): add an argument to keep GVL. + + * io.c (fptr_finalize): adjust for above change. + + * io.c (io_close_fptr): closing without GVL causes another exception + while raising exception in another thread. This causes segfault on + Windows. Keep GVL while closing when another thread raises. + [Bug #13856] + Mon Mar 19 00:04:08 2018 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/forwardable.rb (_delegator_method): leave the backtrace |