diff options
| author | Luke Gruber <luke.gruber@shopify.com> | 2025-12-15 17:07:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-15 17:07:15 -0500 |
| commit | 98ab418fed61079f8ef7e229ea1b41957ec5722b (patch) | |
| tree | 6e65d0c4c2d17ec6c2ea926d2bbbeb2b3e1e4359 /ext | |
| parent | 74b24e09d4f0ba0b930da2fe908002b81e8571a6 (diff) | |
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.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/lib/socket.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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 |