From 2d9a95dc9be95c8ab842ce58c49ab466752f2829 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Fri, 22 Nov 2019 04:57:59 -0500 Subject: hyper knows about these headers too --- teleterm/src/web/ws.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/teleterm/src/web/ws.rs b/teleterm/src/web/ws.rs index ef11641..fe6ca40 100644 --- a/teleterm/src/web/ws.rs +++ b/teleterm/src/web/ws.rs @@ -3,8 +3,6 @@ use futures::Future as _; const PROTO_WEBSOCKET: &str = "websocket"; -const SEC_WEBSOCKET_KEY: &str = "Sec-WebSocket-Key"; -const SEC_WEBSOCKET_ACCEPT: &str = "Sec-WebSocket-Accept"; pub fn requested(headers: &hyper::HeaderMap) -> bool { headers.get(hyper::header::UPGRADE) @@ -41,12 +39,15 @@ pub fn accept( fn response( headers: &hyper::HeaderMap, ) -> Result, ()> { - let key = headers.get(SEC_WEBSOCKET_KEY).ok_or(())?; + let key = headers.get(hyper::header::SEC_WEBSOCKET_KEY).ok_or(())?; Ok(hyper::Response::builder() .header(hyper::header::UPGRADE, PROTO_WEBSOCKET) .header(hyper::header::CONNECTION, "upgrade") - .header(SEC_WEBSOCKET_ACCEPT, accept_key(key.as_bytes())) + .header( + hyper::header::SEC_WEBSOCKET_ACCEPT, + accept_key(key.as_bytes()), + ) .status(hyper::StatusCode::SWITCHING_PROTOCOLS) .body(hyper::Body::empty()) .unwrap()) -- cgit v1.2.3-54-g00ecf