From 725d2e8083a3b3ddad40b120abc05bbb04707e00 Mon Sep 17 00:00:00 2001 From: "ukai@chromium.org" Date: Wed, 11 Aug 2010 01:23:12 +0000 Subject: Fix flaky WebSocket crash with url-with-credential.html url-with-credential.html sometimes crash: [15193:15197:8597261003639:FATAL:net/socket_stream/socket_stream.cc(393)] Check failed: OK == result (0 vs. -3) Backtrace: StackTrace::StackTrace() [0x81a3fca] logging::LogMessage::~LogMessage() [0x814f89f] net::SocketStream::DoLoop() [0x93ca7f1] net::SocketStream::DoClose() [0x93cb171] This happens if the SocketStream is closed while waiting in STATE_TCP_CONNECT. If state is STATE_TCP_CONNECT and result is not OK, it's ok to close. BUG=50394 TEST=url-with-credential.html doesn't crash Review URL: http://codereview.chromium.org/3154003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55648 0039d316-1c4b-4281-b951-d872f2087c98 --- net/socket_stream/socket_stream.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/socket_stream/socket_stream.h') diff --git a/net/socket_stream/socket_stream.h b/net/socket_stream/socket_stream.h index ec97276..87237f1 100644 --- a/net/socket_stream/socket_stream.h +++ b/net/socket_stream/socket_stream.h @@ -241,7 +241,7 @@ class SocketStream : public base::RefCountedThreadSafe { int DoResolveProxyComplete(int result); int DoResolveHost(); int DoResolveHostComplete(int result); - int DoTcpConnect(); + int DoTcpConnect(int result); int DoTcpConnectComplete(int result); int DoWriteTunnelHeaders(); int DoWriteTunnelHeadersComplete(int result); -- cgit v1.1