diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/net/quic/quic_http_stream.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/net/quic/quic_http_stream.cc')
| -rw-r--r-- | chromium/net/quic/quic_http_stream.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chromium/net/quic/quic_http_stream.cc b/chromium/net/quic/quic_http_stream.cc index 2107b89a840..5b21bb9e067 100644 --- a/chromium/net/quic/quic_http_stream.cc +++ b/chromium/net/quic/quic_http_stream.cc @@ -94,23 +94,26 @@ HttpResponseInfo::ConnectionInfo QuicHttpStream::ConnectionInfoFromQuicVersion( case quic::QUIC_VERSION_46: return HttpResponseInfo::CONNECTION_INFO_QUIC_46; case quic::QUIC_VERSION_48: - return quic_version.handshake_protocol == quic::PROTOCOL_TLS1_3 + return quic_version.UsesTls() ? HttpResponseInfo::CONNECTION_INFO_QUIC_T048 : HttpResponseInfo::CONNECTION_INFO_QUIC_Q048; case quic::QUIC_VERSION_49: - return quic_version.handshake_protocol == quic::PROTOCOL_TLS1_3 + return quic_version.UsesTls() ? HttpResponseInfo::CONNECTION_INFO_QUIC_T049 : HttpResponseInfo::CONNECTION_INFO_QUIC_Q049; case quic::QUIC_VERSION_50: - return quic_version.handshake_protocol == quic::PROTOCOL_TLS1_3 + return quic_version.UsesTls() ? HttpResponseInfo::CONNECTION_INFO_QUIC_T050 : HttpResponseInfo::CONNECTION_INFO_QUIC_Q050; case quic::QUIC_VERSION_IETF_DRAFT_25: - DCHECK(quic_version.handshake_protocol == quic::PROTOCOL_TLS1_3); + DCHECK(quic_version.UsesTls()); return HttpResponseInfo::CONNECTION_INFO_QUIC_DRAFT_25; case quic::QUIC_VERSION_IETF_DRAFT_27: - DCHECK(quic_version.handshake_protocol == quic::PROTOCOL_TLS1_3); + DCHECK(quic_version.UsesTls()); return HttpResponseInfo::CONNECTION_INFO_QUIC_DRAFT_27; + case quic::QUIC_VERSION_IETF_DRAFT_29: + DCHECK(quic_version.UsesTls()); + return HttpResponseInfo::CONNECTION_INFO_QUIC_DRAFT_29; case quic::QUIC_VERSION_RESERVED_FOR_NEGOTIATION: return HttpResponseInfo::CONNECTION_INFO_QUIC_999; } |