diff options
| author | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 17:50:51 +0000 |
|---|---|---|
| committer | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-20 17:50:51 +0000 |
| commit | c30bcce5bcaac902a63146da6151494b832bac13 (patch) | |
| tree | f33179c11efe6383ada786fb201fc4a3e5e543e3 /net/websockets/websocket_job.cc | |
| parent | ebc463107e2892419d560195b8325ba4c3229599 (diff) | |
| download | chromium_src-c30bcce5bcaac902a63146da6151494b832bac13.zip chromium_src-c30bcce5bcaac902a63146da6151494b832bac13.tar.gz chromium_src-c30bcce5bcaac902a63146da6151494b832bac13.tar.bz2 | |
Added protocol_version negotiated with the server.
protocol_version will be printed by the LoadTimes
extension.
R=willchan
BUG=108134
TEST=network unittests
Review URL: http://codereview.chromium.org/8914005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets/websocket_job.cc')
| -rw-r--r-- | net/websockets/websocket_job.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc index 03ca0da..7a308e1 100644 --- a/net/websockets/websocket_job.cc +++ b/net/websockets/websocket_job.cc @@ -581,7 +581,9 @@ int WebSocketJob::TrySpdyStream() { spdy_pool->Get(pair, *socket_->net_log()); SSLInfo ssl_info; bool was_npn_negotiated; - bool use_ssl = spdy_session->GetSSLInfo(&ssl_info, &was_npn_negotiated); + SSLClientSocket::NextProto protocol_negotiated; + bool use_ssl = spdy_session->GetSSLInfo( + &ssl_info, &was_npn_negotiated, &protocol_negotiated); if (socket_->is_secure() && !use_ssl) return OK; |