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

Unified Diff: net/http/http_stream_factory.cc

Issue 17410014: Actually enable Alternate-Protocol support for QUIC. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reorder 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 | « net/http/http_stream_factory.h ('k') | net/quic/quic_network_transaction_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory.cc
diff --git a/net/http/http_stream_factory.cc b/net/http/http_stream_factory.cc
index a48fcb6cd1ff2b1a783e7a8c5951e5b1245562ee..0dbd2966304cf1a600b924660c86db3bc2b7c3f5 100644
--- a/net/http/http_stream_factory.cc
+++ b/net/http/http_stream_factory.cc
@@ -143,6 +143,7 @@ void HttpStreamFactory::EnableNpnSpdy() {
set_use_alternate_protocols(true);
std::vector<std::string> next_protos;
next_protos.push_back("http/1.1");
+ next_protos.push_back("quic");
next_protos.push_back("spdy/2");
SetNextProtos(next_protos);
}
@@ -163,6 +164,7 @@ void HttpStreamFactory::EnableNpnSpdy3() {
set_use_alternate_protocols(true);
std::vector<std::string> next_protos;
next_protos.push_back("http/1.1");
+ next_protos.push_back("quic");
next_protos.push_back("spdy/2");
next_protos.push_back("spdy/3");
SetNextProtos(next_protos);
@@ -173,6 +175,7 @@ void HttpStreamFactory::EnableNpnSpdy31() {
set_use_alternate_protocols(true);
std::vector<std::string> next_protos;
next_protos.push_back("http/1.1");
+ next_protos.push_back("quic");
next_protos.push_back("spdy/2");
next_protos.push_back("spdy/3");
next_protos.push_back("spdy/3.1");
« no previous file with comments | « net/http/http_stream_factory.h ('k') | net/quic/quic_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698