net/socket/websocket_transport_client_socket_pool.cc - Issue 394113003: Fix WebSocket race between close and connect.

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/socket/websocket_transport_client_socket_pool.cc

Issue 394113003: Fix WebSocket race between close and connect. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase harder. Created 6 years, 5 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/socket/websocket_transport_client_socket_pool.cc

diff --git a/net/socket/websocket_transport_client_socket_pool.cc b/net/socket/websocket_transport_client_socket_pool.cc

index 131a9662e9ee37905c0fc20019e5894440f5c7f9..648652040ef2b84f89d96a2756ed8f1f69697a12 100644

--- a/net/socket/websocket_transport_client_socket_pool.cc

+++ b/net/socket/websocket_transport_client_socket_pool.cc

@@ -360,8 +360,12 @@ void WebSocketTransportClientSocketPool::RequestSockets(

void WebSocketTransportClientSocketPool::CancelRequest(

const std::string& group_name,

ClientSocketHandle* handle) {

+ DCHECK(!handle->is_initialized());

if (DeleteStalledRequest(handle))

return;

+ scoped_ptr<StreamSocket> socket = handle->PassSocket();

+ if (socket)

+ ReleaseSocket(handle->group_name(), socket.Pass(), handle->id());

if (!DeleteJob(handle))

pending_callbacks_.erase(handle);

if (!ReachedMaxSocketsLimit() && !stalled_request_queue_.empty())

« no previous file with comments | « no previous file | net/socket/websocket_transport_client_socket_pool_unittest.cc » ('j') | no next file with comments »