diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-02-25 13:58:31 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-02-25 13:58:31 +1030 |
| commit | 50e4433b051829350984f0c5eb1271243f6d229d (patch) | |
| tree | 49b981022945253872271314cfe77dcc9aea59a8 /actioncable/lib/action_cable/connection/client_socket.rb | |
| parent | 9e30869c9af4aa5a76d9c63cd9ac080aa3f1ac39 (diff) | |
| parent | a536cc8f1e31e09526b6b43c07ec255d66cd2049 (diff) | |
| download | rails-50e4433b051829350984f0c5eb1271243f6d229d.tar.gz rails-50e4433b051829350984f0c5eb1271243f6d229d.tar.bz2 rails-50e4433b051829350984f0c5eb1271243f6d229d.zip | |
Merge pull request #23843 from maclover7/fix-23471
Only hijack Rack socket when first needed
Diffstat (limited to 'actioncable/lib/action_cable/connection/client_socket.rb')
| -rw-r--r-- | actioncable/lib/action_cable/connection/client_socket.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actioncable/lib/action_cable/connection/client_socket.rb b/actioncable/lib/action_cable/connection/client_socket.rb index 95e1ac4c16..d7632b05fe 100644 --- a/actioncable/lib/action_cable/connection/client_socket.rb +++ b/actioncable/lib/action_cable/connection/client_socket.rb @@ -58,6 +58,7 @@ module ActionCable def start_driver return if @driver.nil? || @driver_started + @stream.hijack_rack_socket @driver_started = true @driver.start end |