Merge branch 'fix/close-ensure-socket'

* fix/close-ensure-socket:
  - socket: rescue transmit in close without logging
  Ensure socket is closed even when transmit raises in Connection#close

Author: palkan

.ruby-version

@@ -0,0 +1 @@
+ruby-4.0.5

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## main
 
+- Tolerate `#transmit` errors on `socket.close`.
+
 ## 0.3.3
 
 - Sync with upstream (Rails 8.2.0.alpha).

lib/action_cable/connection/base.rb

@@ -133,7 +133,7 @@ def close(reason: nil, reconnect: true)
           type: ActionCable::INTERNAL[:message_types][:disconnect],
           reason: reason,
           reconnect: reconnect
-        )
+        ) rescue nil
         socket.close
       end
 

test/connection/base_test.rb

@@ -64,6 +64,19 @@ def disconnect
     end
   end
 
+  test "socket is closed even when transmit raises during close" do
+    connection = open_connection
+    socket = connection.socket
+
+    # Simulate a socket whose output queue has already been closed (e.g. after a
+    # prior restart call), so that transmitting the disconnect message raises.
+    socket.stub(:transmit, ->(*) { raise ClosedQueueError, "queue closed" }) do
+      assert_called(socket, :close) do
+        connection.close(reason: "server_restart")
+      end
+    end
+  end
+
   test "#broadcast" do
     connection = Connection.new(ActionCable.server, ActionCable::Server::Socket.new(ActionCable.server, {}))