Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 08:15:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1690220 - Don't query https rr when proxy CONNECT is in use r=necko-reviewers,dragana

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D103781
This commit is contained in:
Kershaw Chang 2021-02-03 10:32:34 +00:00
parent 22f652b35a
commit d2340e9ce4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -6609,6 +6609,10 @@ nsresult nsHttpChannel::BeginConnect() {
Telemetry::Accumulate(Telemetry::HTTP_TRANSACTION_USE_ALTSVC, false);
}
if (mConnectionInfo->UsingConnect()) {
StoreUseHTTPSSVC(false);
}
// Need to re-ask the handler, since mConnectionInfo may not be the connInfo
// we used earlier
if (!mConnectionInfo->IsHttp3() &&
@ -6782,7 +6786,7 @@ nsresult nsHttpChannel::MaybeStartDNSPrefetch() {
// not "prefetch", since DNS prefetch can be disabled by the pref.
if (LoadUseHTTPSSVC() ||
(gHttpHandler->UseHTTPSRRForSpeculativeConnection() &&
!mHTTPSSVCRecord)) {
!mHTTPSSVCRecord && !mConnectionInfo->UsingConnect())) {
MOZ_ASSERT(!mHTTPSSVCRecord);
OriginAttributes originAttributes;

2
netwerk/protocol/http/nsHttpTransaction.cpp
View File

@ -441,7 +441,7 @@ nsresult nsHttpTransaction::Init(
mPushedStream = trans->TakePushedStreamById(aPushedStreamId);
}
if (gHttpHandler->UseHTTPSRRAsAltSvcEnabled()) {
if (gHttpHandler->UseHTTPSRRAsAltSvcEnabled() && !mConnInfo->UsingConnect()) {
mHTTPSSVCReceivedStage = HTTPSSVC_NOT_PRESENT;
nsCOMPtr<nsIEventTarget> target;