Merge pull request #14 from chriscareycode/firefox-fix

Firefox unable to establish WebSocket connection to MantisAPI
Netflix · Aug 18, 2020 · 1ce4f51 · 1ce4f51
2 parents 764e193 + e7e83f5
commit 1ce4f51
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/io/mantisrx/api/push/MantisSSEHandler.java b/src/main/java/io/mantisrx/api/push/MantisSSEHandler.java
@@ -146,8 +146,10 @@ private boolean isTunnelPingsEnabled(String uri) {
 
     private boolean isWebsocketUpgrade(HttpRequest request) {
         HttpHeaders headers = request.headers();
-        return "Upgrade".equalsIgnoreCase(headers.get(HttpHeaderNames.CONNECTION)) &&
-                "WebSocket".equalsIgnoreCase(headers.get(HttpHeaderNames.UPGRADE));
+        // Header "Connection" contains "upgrade" (case insensitive) and
+        // Header "Upgrade" equals "websocket" (case insensitive)
+        return headers.get(HttpHeaderNames.CONNECTION).toLowerCase().contains("upgrade") &&
+                headers.get(HttpHeaderNames.UPGRADE).toLowerCase().equals("websocket");
     }