diff options
Diffstat (limited to 'ext/http')
| -rw-r--r-- | ext/http/01_http.js | 11 | ||||
| -rw-r--r-- | ext/http/lib.rs | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ext/http/01_http.js b/ext/http/01_http.js index 9ce6997c6..9f05809f5 100644 --- a/ext/http/01_http.js +++ b/ext/http/01_http.js @@ -349,9 +349,14 @@ function upgradeWebSocket(request, options = {}) { const upgrade = request.headers.get("upgrade"); - if (!upgrade || StringPrototypeToLowerCase(upgrade) !== "websocket") { + const upgradeHasWebSocketOption = upgrade !== null && + ArrayPrototypeSome( + StringPrototypeSplit(upgrade, /\s*,\s*/), + (option) => StringPrototypeToLowerCase(option) === "websocket", + ); + if (!upgradeHasWebSocketOption) { throw new TypeError( - "Invalid Header: 'upgrade' header must be 'websocket'", + "Invalid Header: 'upgrade' header must contain 'websocket'", ); } @@ -363,7 +368,7 @@ ); if (!connectionHasUpgradeOption) { throw new TypeError( - "Invalid Header: 'connection' header must be 'Upgrade'", + "Invalid Header: 'connection' header must contain 'Upgrade'", ); } diff --git a/ext/http/lib.rs b/ext/http/lib.rs index ffca4fa2f..aae6415cb 100644 --- a/ext/http/lib.rs +++ b/ext/http/lib.rs @@ -332,7 +332,9 @@ fn is_websocket_request(req: &hyper::Request<hyper::Body>) -> bool { && req.method() == hyper::Method::GET && req.headers().contains_key(&SEC_WEBSOCKET_KEY) && header(req.headers(), &SEC_WEBSOCKET_VERSION) == b"13" - && header(req.headers(), &UPGRADE).eq_ignore_ascii_case(b"websocket") + && header(req.headers(), &UPGRADE) + .split(|c| *c == b' ' || *c == b',') + .any(|token| token.eq_ignore_ascii_case(b"websocket")) && header(req.headers(), &CONNECTION) .split(|c| *c == b' ' || *c == b',') .any(|token| token.eq_ignore_ascii_case(b"upgrade")) |