Index: net/quic/core/quic_protocol.cc |
diff --git a/net/quic/core/quic_protocol.cc b/net/quic/core/quic_protocol.cc |
index dd908d1ff6f9b611fe7f1f1e53b8a0c1fa13dc31..586e3160a18600880b41e4b2649b1adfc9603616 100644 |
--- a/net/quic/core/quic_protocol.cc |
+++ b/net/quic/core/quic_protocol.cc |
@@ -192,7 +192,7 @@ QuicVersionVector FilterSupportedVersions(QuicVersionVector versions) { |
filtered_versions.push_back(version); |
} |
} else if (version == QUIC_VERSION_36) { |
- if (FLAGS_quic_enable_version_35 && FLAGS_quic_enable_version_36) { |
+ if (FLAGS_quic_enable_version_35 && FLAGS_quic_enable_version_36_v2) { |
filtered_versions.push_back(version); |
} |
} else { |
@@ -850,16 +850,16 @@ StringPiece QuicPacket::Plaintext(QuicVersion version) const { |
QuicVersionManager::QuicVersionManager(QuicVersionVector supported_versions) |
: enable_quic_version_35_(FLAGS_quic_enable_version_35), |
- enable_quic_version_36_(FLAGS_quic_enable_version_36), |
+ enable_quic_version_36_(FLAGS_quic_enable_version_36_v2), |
allowed_supported_versions_(supported_versions), |
filtered_supported_versions_( |
FilterSupportedVersions(supported_versions)) {} |
const QuicVersionVector& QuicVersionManager::GetSupportedVersions() { |
if (enable_quic_version_35_ != FLAGS_quic_enable_version_35 || |
- enable_quic_version_36_ != FLAGS_quic_enable_version_36) { |
+ enable_quic_version_36_ != FLAGS_quic_enable_version_36_v2) { |
enable_quic_version_35_ = FLAGS_quic_enable_version_35; |
- enable_quic_version_36_ = FLAGS_quic_enable_version_36; |
+ enable_quic_version_36_ = FLAGS_quic_enable_version_36_v2; |
filtered_supported_versions_ = |
FilterSupportedVersions(allowed_supported_versions_); |
} |