Merge pull request #8 from mu2019/patch-1

Author: jbr

src/handler.rs

@@ -107,9 +107,13 @@ enum UpgradeStatus<S> {
 }
 use UpgradeStatus::{NotUpgraded, Upgraded};
 
-fn header_eq_ignore_case<T>(req: &Request<T>, header_name: HeaderName, value: &str) -> bool {
+fn header_contains_ignore_case<T>(req: &Request<T>, header_name: HeaderName, value: &str) -> bool {
     req.header(header_name)
-        .map(|h| h.as_str().eq_ignore_ascii_case(value))
+        .map(|h| {
+            h.as_str()
+                .split(',')
+                .any(|s| s.trim().eq_ignore_ascii_case(value.trim()))
+        })
         .unwrap_or(false)
 }
 
@@ -139,8 +143,8 @@ where
     }
 
     async fn handle_upgrade(&self, req: Request<S>) -> UpgradeStatus<S> {
-        let connection_upgrade = header_eq_ignore_case(&req, CONNECTION, "upgrade");
-        let upgrade_to_websocket = header_eq_ignore_case(&req, UPGRADE, "websocket");
+        let connection_upgrade = header_contains_ignore_case(&req, CONNECTION, "upgrade");
+        let upgrade_to_websocket = header_contains_ignore_case(&req, UPGRADE, "websocket");
         let upgrade_requested = connection_upgrade && upgrade_to_websocket;
 
         if !upgrade_requested {