summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 19:00:20 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-20 19:00:20 +0000
commit1e96003f8caa6655f7b4018586e74c2472b8f936 (patch)
tree7ab435656f1999f3751b2121fb83825205211d5a /net/http
parent40793524e51cc6c9d15450e80e5398856e9d7f36 (diff)
downloadchromium_src-1e96003f8caa6655f7b4018586e74c2472b8f936.zip
chromium_src-1e96003f8caa6655f7b4018586e74c2472b8f936.tar.gz
chromium_src-1e96003f8caa6655f7b4018586e74c2472b8f936.tar.bz2
Enable support for QUIC 13.
This does NOT cause Chrome to use QUIC 13, that will come later. Refactors the mechanims that QUIC tests use to to create packets. Review URL: https://codereview.chromium.org/110853010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242130 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_network_session.cc4
-rw-r--r--net/http/http_network_session.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 1be93fe5..533c39f 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -87,6 +87,7 @@ HttpNetworkSession::Params::Params()
quic_max_packet_length(kDefaultMaxPacketSize),
enable_user_alternate_protocol_ports(false),
quic_crypto_client_stream_factory(NULL) {
+ quic_supported_versions.push_back(QUIC_VERSION_12);
}
HttpNetworkSession::Params::~Params() {}
@@ -115,7 +116,8 @@ HttpNetworkSession::HttpNetworkSession(const Params& params)
QuicRandom::GetInstance(),
params.quic_clock ? params. quic_clock :
new QuicClock(),
- params.quic_max_packet_length),
+ params.quic_max_packet_length,
+ params.quic_supported_versions),
spdy_session_pool_(params.host_resolver,
params.ssl_config_service,
params.http_server_properties,
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 4710412..40d022d 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -94,6 +94,7 @@ class NET_EXPORT HttpNetworkSession
size_t quic_max_packet_length;
bool enable_user_alternate_protocol_ports;
QuicCryptoClientStreamFactory* quic_crypto_client_stream_factory;
+ QuicVersionVector quic_supported_versions;
};
enum SocketPoolType {