net/socket_stream/socket_stream.cc - Issue 10668018: Websocket should fire 'error' event if no server available

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_stream/socket_stream.cc

Issue 10668018: Websocket should fire 'error' event if no server available (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Rebase because AUTHORS file is changed. Created 7 years, 8 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_stream/socket_stream.cc

diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc

index 84b58bc2380d676223c6d35e2aae96ef58e7eb35..70f14629295fe94e508529cc056b4104c80b3375 100644

--- a/net/socket_stream/socket_stream.cc

+++ b/net/socket_stream/socket_stream.cc

@@ -359,7 +359,8 @@ void SocketStream::Finish(int result) {

Delegate* delegate = delegate_;

delegate_ = NULL;

if (delegate) {

- delegate->OnError(this, result);

+ if (result != ERR_CONNECTION_CLOSED && result != ERR_PROTOCOL_SWITCHED)

+ delegate->OnError(this, result);

if (result != ERR_PROTOCOL_SWITCHED)

delegate->OnClose(this);

}