Skip to content

Commit 98ab418

Browse files
authored
Revert "Fix Socket.tcp cleanup after Thread#kill (ruby#15131)" (ruby#15565)
This reverts commit 3038286. 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.
1 parent 74b24e0 commit 98ab418

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

ext/socket/lib/socket.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,8 +917,7 @@ def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil,
917917
end
918918
ensure
919919
hostname_resolution_threads.each do |thread|
920-
thread.kill
921-
thread.join
920+
thread.exit
922921
end
923922

924923
hostname_resolution_result&.close

0 commit comments

Comments
 (0)