summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-09-22 18:48:10 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-09-22 18:02:56 +0000
commit08a25bf9dd2d0be736026540dda176dff8102a9a (patch)
tree6b639aa289a6237f43f057c3b7c63b158d90c2a2
parent43812fd40d46bc9bb723651aea1e5ff08a4b3692 (diff)
downloadqtwebengine-chromium-08a25bf9dd2d0be736026540dda176dff8102a9a.tar.gz
Only upgrade to WebSocket when WebSocket was requested
Otherwise we can end up rejecting pre-upgraded HTTP/2 requests. Task-number: QTBUG-86824 Change-Id: I0d7e4a716729c4bba8fff8351d08c54285319a60 Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r--chromium/net/server/http_server.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/net/server/http_server.cc b/chromium/net/server/http_server.cc
index e6316a67217..151e7af65e1 100644
--- a/chromium/net/server/http_server.cc
+++ b/chromium/net/server/http_server.cc
@@ -278,7 +278,7 @@ int HttpServer::HandleReadResult(HttpConnection* connection, int rv) {
// Sets peer address if exists.
connection->socket()->GetPeerAddress(&request.peer);
- if (request.HasHeaderValue("connection", "upgrade")) {
+ if (request.HasHeaderValue("connection", "upgrade") && request.HasHeaderValue("upgrade", "websocket")) {
connection->SetWebSocket(std::make_unique<WebSocket>(this, connection));
read_buf->DidConsume(pos);
delegate_->OnWebSocketRequest(connection->id(), request);