actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-08-31 08:57:00 +02:00
Code Issues Releases Wiki Activity

use new version of http crate

Browse Source
This commit is contained in:
Nikolay Kim
2018-02-28 14:16:55 -08:00
parent 1284264511
commit d62d6e68e0
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ws/client.rs
View File

@@ -197,11 +197,11 @@ impl WsClient {
self.request.upgrade();
self.request.set_header(header::UPGRADE, "websocket");
self.request.set_header(header::CONNECTION, "upgrade");
self.request.set_header("SEC-WEBSOCKET-VERSION", "13");
self.request.set_header(header::SEC_WEBSOCKET_VERSION, "13");
self.request.with_connector(self.conn.clone());
if let Some(protocols) = self.protocols.take() {
self.request.set_header("SEC-WEBSOCKET-PROTOCOL", protocols.as_str());
self.request.set_header(header::SEC_WEBSOCKET_PROTOCOL, protocols.as_str());
}
let request = match self.request.finish() {
Ok(req) => req,
@@ -249,7 +249,7 @@ impl WsClientHandshake {
let key = base64::encode(&sec_key);
request.headers_mut().insert(
HeaderName::try_from("SEC-WEBSOCKET-KEY").unwrap(),
header::SEC_WEBSOCKET_KEY,
HeaderValue::try_from(key.as_str()).unwrap());
let (tx, rx) = unbounded();
@@ -328,8 +328,7 @@ impl Future for WsClientHandshake {
return Err(WsClientError::MissingConnectionHeader)
}
if let Some(key) = resp.headers().get(
HeaderName::try_from("SEC-WEBSOCKET-ACCEPT").unwrap())
if let Some(key) = resp.headers().get(header::SEC_WEBSOCKET_ACCEPT)
{
// field is constructed by concatenating /key/
// with the string "258EAFA5-E914-47DA-95CA-C5AB0DC85B11" (RFC 6455)