diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 16:05:18 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 16:05:18 +0000 |
| commit | 1bf1731f302628b460be391a3c9561152dbfda04 (patch) | |
| tree | 530b3a1a6bdc1bffa55c1e3cdcef486f3fce42ac /net/socket_stream/socket_stream.cc | |
| parent | d34415c17079ebf8cf8557aa0ee0e464624b7180 (diff) | |
| download | chromium_src-1bf1731f302628b460be391a3c9561152dbfda04.zip chromium_src-1bf1731f302628b460be391a3c9561152dbfda04.tar.gz chromium_src-1bf1731f302628b460be391a3c9561152dbfda04.tar.bz2 | |
Add WebSocket over SPDY experimental implementation.
(Re-land with memory leak fix)
- Realize WebSocketJob's internal protocol switch to SPDY using SpdyWebSocketStream
- Add simple test to verify connection over SPDY
BUG=42320
TEST=net_unittests --gtest_filter=WebSocketJobTest\*
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=91997
Review URL: http://codereview.chromium.org/7185032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream/socket_stream.cc')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index 4c5b13a..d89c074 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -290,14 +290,14 @@ void SocketStream::Finish(int result) { result = ERR_CONNECTION_CLOSED; DCHECK_EQ(next_state_, STATE_NONE); DVLOG(1) << "Finish result=" << ErrorToString(result); - if (delegate_) - delegate_->OnError(this, result); metrics_->OnClose(); Delegate* delegate = delegate_; delegate_ = NULL; if (delegate) { - delegate->OnClose(this); + delegate->OnError(this, result); + if (result != ERR_PROTOCOL_SWITCHED) + delegate->OnClose(this); } Release(); } |