summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_client_socket_pool.cc
diff options
context:
space:
mode:
authorrtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-05 23:03:24 +0000
committerrtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-05 23:03:24 +0000
commit55e973d09a29ed6e79bb72c506588ce161b34cc6 (patch)
tree96bf8c3737f1b1a4ff60f0fd26ce6cb5361c1482 /net/socket/ssl_client_socket_pool.cc
parent93ebb45a57cd9cc89622dda27ed00809eee0d1d4 (diff)
downloadchromium_src-55e973d09a29ed6e79bb72c506588ce161b34cc6.zip
chromium_src-55e973d09a29ed6e79bb72c506588ce161b34cc6.tar.gz
chromium_src-55e973d09a29ed6e79bb72c506588ce161b34cc6.tar.bz2
Log server advertised protos and the selected
next_proto to net-internals log. In net internal logs, we will log proto in the following manner: (P) t=1323112212350 [st=463] HTTP_STREAM_REQUEST_PROTO --> next_proto_status = "negotiated" --> proto = "spdy/2" --> server_protos = "spdy/2,http/1.1" BUG=62064 TEST=network unit tests R=willchan The following was the original CL: http://codereview.chromium.org/8676046/ Review URL: http://codereview.chromium.org/8787011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_pool.cc')
-rw-r--r--net/socket/ssl_client_socket_pool.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index a924b5a..4fffac6 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -286,11 +286,12 @@ int SSLConnectJob::DoSSLConnectComplete(int result) {
SSLClientSocket::NextProtoStatus status =
SSLClientSocket::kNextProtoUnsupported;
std::string proto;
+ std::string server_protos;
// GetNextProto will fail and and trigger a NOTREACHED if we pass in a socket
// that hasn't had SSL_ImportFD called on it. If we get a certificate error
// here, then we know that we called SSL_ImportFD.
if (result == OK || IsCertificateError(result))
- status = ssl_socket_->GetNextProto(&proto);
+ status = ssl_socket_->GetNextProto(&proto, &server_protos);
// If we want spdy over npn, make sure it succeeded.
if (status == SSLClientSocket::kNextProtoNegotiated) {