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; |