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

Unified Diff: net/http/http_network_session.cc

Issue 1453903002: Re-enable HTTP/2 over NPN (for OpenSSL). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Initialize |enable_npn| in other SpdySessionDependencies constructor. Created 5 years, 1 month 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/http/http_network_transaction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_session.cc
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index adb47058c43e17500038c5a2e0b22b017465c6a3..2a7e469c02213625043007e4eb6c5cb55c7ec021 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -333,7 +333,6 @@ void HttpNetworkSession::GetAlpnProtos(NextProtoVector* alpn_protos) const {
void HttpNetworkSession::GetNpnProtos(NextProtoVector* npn_protos) const {
if (HttpStreamFactory::spdy_enabled() && params_.enable_npn) {
*npn_protos = next_protos_;
- DisableHTTP2(npn_protos);
} else {
npn_protos->clear();
}
« no previous file with comments | « no previous file | net/http/http_network_transaction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698