From e316fa1d3bbf1ea5244b6404e3b7753bd1e02a72 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 28 Feb 2021 01:11:21 +0000
Subject: [PATCH] update changelog

---
 actix-http/CHANGES.md                   | 2 ++
 actix-http/Cargo.toml                   | 2 +-
 actix-http/examples/{h2-ws.rs => ws.rs} | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename actix-http/examples/{h2-ws.rs => ws.rs} (97%)

diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index 6ba111eb3..165b004a6 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -3,6 +3,7 @@
 ## Unreleased - 2021-xx-xx
 ### Changed
 * Feature `cookies` is now optional and disabled by default. [#1981]
+* `ws::hash_key` now returns array. [#2035]
 
 ### Removed
 * re-export of `futures_channel::oneshot::Canceled` is removed from `error` mod. [#1994]
@@ -10,6 +11,7 @@
 
 [#1981]: https://github.com/actix/actix-web/pull/1981
 [#1994]: https://github.com/actix/actix-web/pull/1994
+[#2035]: https://github.com/actix/actix-web/pull/2035
 
 
 ## 3.0.0-beta.3 - 2021-02-10
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 2d8acef77..d7915ddf9 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -104,7 +104,7 @@ package = "openssl"
 features = ["vendored"]
 
 [[example]]
-name = "h2-ws"
+name = "ws"
 required-features = ["rustls"]
 
 [[bench]]
diff --git a/actix-http/examples/h2-ws.rs b/actix-http/examples/ws.rs
similarity index 97%
rename from actix-http/examples/h2-ws.rs
rename to actix-http/examples/ws.rs
index 11e3704bf..d27df0ca1 100644
--- a/actix-http/examples/h2-ws.rs
+++ b/actix-http/examples/ws.rs
@@ -1,5 +1,5 @@
 //! Sets up a WebSocket server over TCP and TLS.
-//! Sends a heartbeat message every 4 seconds and does not respond to any incoming frames.
+//! Sends a heartbeat message every 4 seconds but does not respond to any incoming frames.
 
 extern crate tls_rustls as rustls;