mirror/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2026-01-27 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix Socket.tcp cleanup after Thread#kill (#15131)" (#15565)

Browse Source 
This reverts commit 3038286a4bf7832f1c42c8cc9774ee6ff19876fc.

The following CI failure scared me:
https://github.com/ruby/ruby/actions/runs/20241051861/job/58108997049

```
  1) Timeout:
  TestResolvDNS#test_multiple_servers_with_timeout_and_truncated_tcp_fallback
```

Since it could be related, I'm reverting this for now.
This commit is contained in:
Luke Gruber 2025-12-15 17:07:15 -05:00 committed by GitHub
parent 74b24e09d4
commit 98ab418fed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
Notes: git 2025-12-15 22:07:45 +00:00 
Merged-By: luke-gru <luke.gru@gmail.com>
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/socket/lib/socket.rb
View File

@ -917,8 +917,7 @@ class Socket < BasicSocket
end
ensure
hostname_resolution_threads.each do |thread|
thread.kill
thread.join
thread.exit
end
hostname_resolution_result&.close