From 98ab418fed61079f8ef7e229ea1b41957ec5722b Mon Sep 17 00:00:00 2001
From: Luke Gruber <luke.gruber@shopify.com>
Date: Mon, 15 Dec 2025 17:07:15 -0500
Subject: Revert "Fix Socket.tcp cleanup after Thread#kill (#15131)" (#15565)

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.
---
 ext/socket/lib/socket.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'ext')

diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index dae1c16760..9862c92c0b 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -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
-- 
cgit v1.2.3