1 files changed, 14 insertions, 2 deletions
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
index 9aee32ddb4..cc15e9bf61 100644
--- a/actioncable/CHANGELOG.md
+++ b/actioncable/CHANGELOG.md
@@ -1,5 +1,17 @@
-*  Add ActiveSupport::Notifications hook to Broadcaster#broadcast
+*   Protect against concurrent writes to a websocket connection from
+    multiple threads; the underlying OS write is not always threadsafe.
+
+    *Tinco Andringa*
+
+*   Add ActiveSupport::Notifications hook to Broadcaster#broadcast
+
+    *Matthew Wear*
+
+*   Close hijacked socket when connection is shut down.
+
+    Fixes #25613.
+
+    *Tinco Andringa*
 
-   *Matthew Wear*
 
 Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actioncable/CHANGELOG.md) for previous changes.