Merge pull request rails#25615 from tinco/close_hijacked_socket

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

Author: matthewd

actioncable/lib/action_cable/connection/stream.rb

@@ -50,6 +50,7 @@ def hijack_rack_socket
         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

actioncable/test/connection/client_socket_test.rb

@@ -48,6 +48,20 @@ def on_error(message)
     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',