net/server/http_server.cc - Issue 1340523002: Fix WebSocketServer extension parser.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/server/http_server.cc

Issue 1340523002: Fix WebSocketServer extension parser. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ws-constructor-fix

Patch Set: Created 5 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: net/server/http_server.cc

diff --git a/net/server/http_server.cc b/net/server/http_server.cc

index 23528ccaac79463a64e151436bdd76899f38d106..f3560e8cabd02660da9dd6e10eafece6fa7c6503 100644

--- a/net/server/http_server.cc

+++ b/net/server/http_server.cc

@@ -236,11 +236,8 @@ int HttpServer::HandleReadResult(HttpConnection* connection, int rv) {

connection->socket()->GetPeerAddress(&request.peer);

if (request.HasHeaderValue("connection", "upgrade")) {

- scoped_ptr<WebSocket> websocket(

- WebSocket::CreateWebSocket(this, connection, request));

- if (!websocket) // Not enough data was received.

- break;

- connection->SetWebSocket(websocket.Pass());

+ connection->SetWebSocket(

+ make_scoped_ptr(new WebSocket(this, connection)));

read_buf->DidConsume(pos);

delegate_->OnWebSocketRequest(connection->id(), request);

if (HasClosedConnection(connection))