Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

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: Rebased by tyoshino 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/socket_stream_messages.h ('k') | webkit/glue/websocketstreamhandle_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)
Li Yin 2013/04/26 06:57:18 I am unfamiliar with SwitchToSpdy related code, an
tyoshino (SeeGerritForStatus) 2013/04/26 07:19:43 Yes. I'm looking here too. Raising ERR_PROTOCOL_SW
+ delegate->OnError(this, result);
if (result != ERR_PROTOCOL_SWITCHED)
delegate->OnClose(this);
}
« no previous file with comments | « content/common/socket_stream_messages.h ('k') | webkit/glue/websocketstreamhandle_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698