diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 20:25:48 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 20:25:48 +0000 |
| commit | 61cb7da0ff02a93b20cccddad8b4dbbca84a4e06 (patch) | |
| tree | fe88b4e2c64facdcb01c60ed8ac51f4e0f146865 /net/spdy | |
| parent | 800628f2306f5cbe44065093c8ac49c351e2c1f6 (diff) | |
| download | chromium_src-61cb7da0ff02a93b20cccddad8b4dbbca84a4e06.zip chromium_src-61cb7da0ff02a93b20cccddad8b4dbbca84a4e06.tar.gz chromium_src-61cb7da0ff02a93b20cccddad8b4dbbca84a4e06.tar.bz2 | |
Properly display the negotiated protocol for spdy proxy sessions.
BUG=134864
TEST=Visit an HTTP URL through a SPDY proxy. View the session in chrome://net-internals/#spdy and notice that the protocol is not "unknow".
Review URL: https://chromiumcodereview.appspot.com/10695010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144532 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy')
| -rw-r--r-- | net/spdy/spdy_session.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index 192baad..613d242 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc @@ -1061,12 +1061,9 @@ Value* SpdySession::GetInfoAsValue() const { dict->SetBoolean("is_secure", is_secure_); - NextProto proto = kProtoUnknown; - if (is_secure_) { - proto = GetSSLClientSocket()->GetNegotiatedProtocol(); - } dict->SetString("protocol_negotiated", - SSLClientSocket::NextProtoToString(proto)); + SSLClientSocket::NextProtoToString( + connection_->socket()->GetNegotiatedProtocol())); dict->SetInteger("error", error_); dict->SetInteger("max_concurrent_streams", max_concurrent_streams_); |