aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/CHANGELOG.md
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-10-01 15:14:43 +0930
committerMatthew Draper <matthew@trebex.net>2016-10-01 15:18:39 +0930
commit9588a3d66d4ca6ba122d32417aa62680f441bf40 (patch)
tree633978aa86df6eaed98595d54754b89a2b5fbbb8 /actioncable/CHANGELOG.md
parent72f97e281059bc983eef5bc8915e53249c623dff (diff)
parent3e68d8b872b48ecb45268a7e5fcb937e68f2724f (diff)
downloadrails-9588a3d66d4ca6ba122d32417aa62680f441bf40.tar.gz
rails-9588a3d66d4ca6ba122d32417aa62680f441bf40.tar.bz2
rails-9588a3d66d4ca6ba122d32417aa62680f441bf40.zip
Merge pull request #26547 from palkan/fix/actioncable-confirmation-race-condition
Avoid race condition on subscription confirmation
Diffstat (limited to 'actioncable/CHANGELOG.md')
-rw-r--r--actioncable/CHANGELOG.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index 2e6c2f2afc..137c88d91b 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -1,3 +1,11 @@
+* Prevent race where the client could receive and act upon a
+ subscription confirmation before the channel's `subscribed` method
+ completed.
+
+ Fixes #25381.
+
+ *Vladimir Dementyev*
+
* Buffer writes to websocket connections, to avoid blocking threads
that could be doing more useful things.