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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_pool.cc

Issue 2347163002: s/NPN/ALPN/ (Closed)
Patch Set: Re: #12. Created 4 years, 3 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 | « net/quic/chromium/quic_network_transaction_unittest.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool.cc
diff --git a/net/socket/ssl_client_socket_pool.cc b/net/socket/ssl_client_socket_pool.cc
index 3a7d0541ad0eac2de43456efc546e9258d66f008..10868ae51442b2628c6ae56f84a54ffdc4b3214a 100644
--- a/net/socket/ssl_client_socket_pool.cc
+++ b/net/socket/ssl_client_socket_pool.cc
@@ -335,10 +335,10 @@ int SSLConnectJob::DoSSLConnectComplete(int result) {
server_address_ = IPEndPoint();
}
- // If we want SPDY over ALPN/NPN, make sure it succeeded.
+ // If we want SPDY over ALPN, make sure it succeeded.
if (params_->expect_spdy() &&
ssl_socket_->GetNegotiatedProtocol() != kProtoHTTP2) {
- return ERR_NPN_NEGOTIATION_FAILED;
+ return ERR_ALPN_NEGOTIATION_FAILED;
}
if (result == OK ||
« no previous file with comments | « net/quic/chromium/quic_network_transaction_unittest.cc ('k') | net/socket/ssl_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698