Merge pull request #25615 from tinco/close_hijacked_socket

close hijacked i/o socket after use (fixes #25613)

2 files changed, 15 insertions, 0 deletions

diff --git a/actioncable/lib/action_cable/connection/stream.rb b/actioncable/lib/action_cable/connection/stream.rb
index 0cf59091bc..c250cf92fc 100644
--- a/actioncable/lib/action_cable/connection/stream.rb
+++ b/actioncable/lib/action_cable/connection/stream.rb
@@ -50,6 +50,7 @@ module ActionCable
         def clean_rack_hijack
           return unless @rack_hijack_io
           @event_loop.detach(@rack_hijack_io, self)
+          @rack_hijack_io.close
           @rack_hijack_io = nil
         end
     end
diff --git a/actioncable/test/connection/client_socket_test.rb b/actioncable/test/connection/client_socket_test.rb
index 4af071b4da..fe9077ae7f 100644
--- a/actioncable/test/connection/client_socket_test.rb
+++ b/actioncable/test/connection/client_socket_test.rb
@@ -48,6 +48,20 @@ class ActionCable::Connection::ClientSocketTest < ActionCable::TestCase
     end
   end
 
+  test 'closes hijacked i/o socket at shutdown' do
+    skip if ENV['FAYE'].present?
+
+    run_in_eventmachine do
+      connection = open_connection
+
+      client = connection.websocket.send(:websocket)
+      client.instance_variable_get('@stream')
+        .instance_variable_get('@rack_hijack_io')
+        .expects(:close)
+      connection.close
+    end
+  end
+
   private
     def open_connection
       env = Rack::MockRequest.env_for '/test',