aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-08-21 21:21:44 +0200
committerGitHub <noreply@github.com>2016-08-21 21:21:44 +0200
commit0f0349b7ee13015944f11bc34a907d2d4157dde4 (patch)
treebf7c5dc51487259014e550b76632a0c8aabdc8c3 /actioncable/lib
parent0432652f234608634dc8d9c50792ed88235b0d53 (diff)
parent831e2c8d1bf13cd944f5683980cfe95f59db2ae8 (diff)
downloadrails-0f0349b7ee13015944f11bc34a907d2d4157dde4.tar.gz
rails-0f0349b7ee13015944f11bc34a907d2d4157dde4.tar.bz2
rails-0f0349b7ee13015944f11bc34a907d2d4157dde4.zip
Merge pull request #23759 from maclover7/fix-23757
Prevent invocation of channel action if rejected connection
Diffstat (limited to 'actioncable/lib')
-rw-r--r--actioncable/lib/action_cable/channel/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/channel/base.rb b/actioncable/lib/action_cable/channel/base.rb
index 8ab061171e..2e589a2cfa 100644
--- a/actioncable/lib/action_cable/channel/base.rb
+++ b/actioncable/lib/action_cable/channel/base.rb
@@ -247,7 +247,7 @@ module ActionCable
end
def processable_action?(action)
- self.class.action_methods.include?(action.to_s)
+ self.class.action_methods.include?(action.to_s) unless subscription_rejected?
end
def dispatch_action(action, data)