Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(809)

Unified Diff: net/socket/ssl_client_socket_nss.cc

Issue 8787011: Log server advertised protos and the selected (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/ssl_client_socket_nss.h ('k') | net/socket/ssl_client_socket_openssl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.cc
===================================================================
--- net/socket/ssl_client_socket_nss.cc (revision 112817)
+++ net/socket/ssl_client_socket_nss.cc (working copy)
@@ -556,8 +556,10 @@
}
SSLClientSocket::NextProtoStatus
-SSLClientSocketNSS::GetNextProto(std::string* proto) {
+SSLClientSocketNSS::GetNextProto(std::string* proto,
+ std::string* server_protos) {
*proto = next_proto_;
+ *server_protos = server_protos_;
return next_proto_status_;
}
@@ -2598,6 +2600,9 @@
i += len + 1;
}
+ that->server_protos_.assign(
+ reinterpret_cast<const char*>(protos), protos_len);
+
// If we didn't find a protocol, we select the first one from our list.
if (that->next_proto_status_ != kNextProtoNegotiated) {
that->next_proto_status_ = kNextProtoNoOverlap;
« no previous file with comments | « net/socket/ssl_client_socket_nss.h ('k') | net/socket/ssl_client_socket_openssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698