Chromium Code Reviews| Index: net/socket/ssl_client_socket_nss.h |
| =================================================================== |
| --- net/socket/ssl_client_socket_nss.h (revision 112817) |
| +++ net/socket/ssl_client_socket_nss.h (working copy) |
| @@ -67,7 +67,8 @@ |
| const base::StringPiece& context, |
| unsigned char *out, |
| unsigned int outlen) OVERRIDE; |
| - virtual NextProtoStatus GetNextProto(std::string* proto) OVERRIDE; |
| + virtual NextProtoStatus GetNextProto(std::string* proto, |
| + std::string* server_proto) OVERRIDE; |
|
agl
2011/12/05 16:38:10
s
ramant (doing other things)
2011/12/05 19:03:28
Done.
|
| // StreamSocket methods: |
| virtual int Connect(OldCompletionCallback* callback) OVERRIDE; |
| @@ -300,6 +301,8 @@ |
| // next_proto_ is the protocol that we selected by NPN. |
| std::string next_proto_; |
| NextProtoStatus next_proto_status_; |
| + // Server's NPN advertised proto. |
|
agl
2011/12/05 16:38:10
protocols.
ramant (doing other things)
2011/12/05 19:03:28
Done.
|
| + std::string protos_; |
|
agl
2011/12/05 16:38:10
server_protos_
ramant (doing other things)
2011/12/05 19:03:28
Done.
|
| // The following two variables are added for debugging bug 65948. Will |
| // remove this code after fixing bug 65948. |