From c2f713b6bb424bdc2168c35785e93fcb5f50f3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 3 Dec 2019 09:48:49 +0200 Subject: [PATCH] Update to http 0.2 --- Cargo.toml | 2 +- src/handshake/server.rs | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ec0b5c1..bfc48a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ tls = ["native-tls"] base64 = "0.11.0" byteorder = "1.3.2" bytes = "0.4.12" -http = "0.1.19" +http = "0.2" httparse = "1.3.4" input_buffer = "0.2.0" log = "0.4.8" diff --git a/src/handshake/server.rs b/src/handshake/server.rs index f665a0b..fb75192 100644 --- a/src/handshake/server.rs +++ b/src/handshake/server.rs @@ -75,15 +75,14 @@ pub fn create_response(request: &Request) -> Result { .get("Sec-WebSocket-Key") .ok_or_else(|| Error::Protocol("Missing Sec-WebSocket-Key".into()))?; - let mut response = Response::builder(); - - response.status(StatusCode::SWITCHING_PROTOCOLS); - response.version(request.version()); - response.header("Connection", "Upgrade"); - response.header("Upgrade", "websocket"); - response.header("Sec-WebSocket-Accept", convert_key(key.as_bytes())?); - - Ok(response.body(())?) + let builder = Response::builder() + .status(StatusCode::SWITCHING_PROTOCOLS) + .version(request.version()) + .header("Connection", "Upgrade") + .header("Upgrade", "websocket") + .header("Sec-WebSocket-Accept", convert_key(key.as_bytes())?); + + Ok(builder.body(())?) } // Assumes that this is a valid response