kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

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

Browse source
This commit is contained in:
Tinco Andringa 2016-07-01 00:42:51 +02:00
parent b036b7a810
commit 3120b51de7
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
actioncable/lib/action_cable/connection/stream.rb
View file

@ -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

14
actioncable/test/connection/client_socket_test.rb
View file

@ -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',