diff options
| author | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-05 23:03:24 +0000 |
|---|---|---|
| committer | rtenneti@google.com <rtenneti@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-05 23:03:24 +0000 |
| commit | 55e973d09a29ed6e79bb72c506588ce161b34cc6 (patch) | |
| tree | 96bf8c3737f1b1a4ff60f0fd26ce6cb5361c1482 /net/socket/ssl_client_socket.h | |
| parent | 93ebb45a57cd9cc89622dda27ed00809eee0d1d4 (diff) | |
| download | chromium_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.h')
| -rw-r--r-- | net/socket/ssl_client_socket.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket.h b/net/socket/ssl_client_socket.h index ca4393b..a496ed2 100644 --- a/net/socket/ssl_client_socket.h +++ b/net/socket/ssl_client_socket.h @@ -121,10 +121,19 @@ class NET_EXPORT SSLClientSocket : public SSLSocket { // kNextProtoNegotiated: *proto is set to the negotiated protocol. // kNextProtoNoOverlap: *proto is set to the first protocol in the // supported list. - virtual NextProtoStatus GetNextProto(std::string* proto) = 0; + // *server_protos is set to the server advertised protocols. + virtual NextProtoStatus GetNextProto(std::string* proto, + std::string* server_protos) = 0; static NextProto NextProtoFromString(const std::string& proto_string); + static const char* NextProtoStatusToString( + const SSLClientSocket::NextProtoStatus status); + + // Can be used with the second argument(|server_protos|) of |GetNextProto| to + // construct a comma separated string of server advertised protocols. + static std::string ServerProtosToString(const std::string& server_protos); + static bool IgnoreCertError(int error, int load_flags); virtual bool was_npn_negotiated() const; |