aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable/connection/base.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-06-20 17:03:43 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-06-20 17:03:43 +0200
commit082c6317f0b680f4bcd3b1643e6481bed4606139 (patch)
tree2e72291c713335b20f26454429113ed8bcbcd449 /lib/action_cable/connection/base.rb
parent995c101caae06ec38d0106dcd9ee36954a489687 (diff)
downloadrails-082c6317f0b680f4bcd3b1643e6481bed4606139.tar.gz
rails-082c6317f0b680f4bcd3b1643e6481bed4606139.tar.bz2
rails-082c6317f0b680f4bcd3b1643e6481bed4606139.zip
Update request to do the env_config merge and add cookies helper
Diffstat (limited to 'lib/action_cable/connection/base.rb')
-rw-r--r--lib/action_cable/connection/base.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb
index 52f94a7ab0..295b71ecb3 100644
--- a/lib/action_cable/connection/base.rb
+++ b/lib/action_cable/connection/base.rb
@@ -109,6 +109,14 @@ module ActionCable
end
protected
+ def request
+ @request ||= ActionDispatch::Request.new(Rails.application.env_config.merge(env))
+ end
+
+ def cookies
+ request.cookie_jar
+ end
+
def initialize_connection
server.add_connection(self)
@@ -173,10 +181,6 @@ module ActionCable
@websocket && @websocket.ready_state == Faye::WebSocket::API::OPEN
end
- def request
- @request ||= ActionDispatch::Request.new(env)
- end
-
def websocket?
@is_websocket ||= Faye::WebSocket.websocket?(@env)
end