diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-07-04 15:18:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 15:18:43 -0400 |
| commit | 80a9510b753132a46a69571a1e8db7fcf3368f65 (patch) | |
| tree | 31936cd97413d626b1f973528402a47539f9716f /actioncable | |
| parent | f1f88e255620569f40d237ccdb4c0e5786f06c0e (diff) | |
| parent | 93e185e1d41bc658328c69d637616ab355da513e (diff) | |
| download | rails-80a9510b753132a46a69571a1e8db7fcf3368f65.tar.gz rails-80a9510b753132a46a69571a1e8db7fcf3368f65.tar.bz2 rails-80a9510b753132a46a69571a1e8db7fcf3368f65.zip | |
Merge pull request #33288 from ioquatix/patch-2
Better compatibility with SPEC.
Diffstat (limited to 'actioncable')
| -rw-r--r-- | actioncable/lib/action_cable/connection/stream.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable/connection/stream.rb b/actioncable/lib/action_cable/connection/stream.rb index 4873026b71..e658948a55 100644 --- a/actioncable/lib/action_cable/connection/stream.rb +++ b/actioncable/lib/action_cable/connection/stream.rb @@ -98,8 +98,10 @@ module ActionCable def hijack_rack_socket return unless @socket_object.env["rack.hijack"] - @socket_object.env["rack.hijack"].call - @rack_hijack_io = @socket_object.env["rack.hijack_io"] + # This should return the underlying io according to the SPEC: + @rack_hijack_io = @socket_object.env["rack.hijack"].call + # Retain existing behaviour if required: + @rack_hijack_io ||= @socket_object.env["rack.hijack_io"] @event_loop.attach(@rack_hijack_io, self) end |