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

Unified Diff: net/socket/ssl_client_socket_nss.cc

Issue 18346010: net: support ALPN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove the new error. Created 7 years, 6 months 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 | « no previous file | net/third_party/nss/patches/alpn.patch » ('j') | net/third_party/nss/ssl/sslt.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_nss.cc
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index bffadfa9c6e79a77256556ebb855f43056d2b021..f483b11533b6d921d146b7958d2c16b56686dc1b 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -2498,6 +2498,7 @@ void SSLClientSocketNSS::Core::UpdateNextProto() {
std::string(reinterpret_cast<char*>(buf), buf_len);
switch (state) {
case SSL_NEXT_PROTO_NEGOTIATED:
+ case SSL_NEXT_PROTO_SELECTED:
Ryan Sleevi 2013/07/02 19:13:10 This will affect the histograms for NPN, as well a
nss_handshake_state_.next_proto_status = kNextProtoNegotiated;
break;
case SSL_NEXT_PROTO_NO_OVERLAP:
« no previous file with comments | « no previous file | net/third_party/nss/patches/alpn.patch » ('j') | net/third_party/nss/ssl/sslt.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698