Solves issue 107

snapview#107
jadedevin13 · Feb 11, 2020 · dff9827 · dff9827
1 parent 1773269
commit dff9827
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/handshake/server.rs b/src/handshake/server.rs
@@ -75,13 +75,24 @@ pub fn create_response(request: &Request) -> Result<Response> {
         .get("Sec-WebSocket-Key")
         .ok_or_else(|| Error::Protocol("Missing Sec-WebSocket-Key".into()))?;
 
-    let builder = Response::builder()
+    let protocol_default = HeaderValue::from_static("");
+
+    let protocol = request
+        .headers()
+        .get("Sec-WebSocket-Protocol")
+        .unwrap_or(&protocol_default);
+
+    let mut 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())?);
 
+    if !protocol.is_empty() {
+        builder = builder.header("Sec-WebSocket-Protocol", protocol);
+    }
+
     Ok(builder.body(())?)
 }