Commit b6e2dc2b authored by Eric Orth's avatar Eric Orth Committed by Commit Bot

Remove DoH retry hack

All configured DoH providers should now only be queried at most once per
DNS transaction. Recent timeout logic has extended the time period
Chrome will wait for these servers in cases where there is no fallback
available to non-DoH.

Bug: 1109792,1105138
Change-Id: I661a8ff480dac4b73fb4f66cd28a237139e54433
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2471717
Commit-Queue: Eric Orth <ericorth@chromium.org>
Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#819135}
parent 7105b7f5
...@@ -537,13 +537,6 @@ void NetworkService::ConfigureStubHostResolver( ...@@ -537,13 +537,6 @@ void NetworkService::ConfigureStubHostResolver(
SplitString(features::kDnsOverHttpsUpgradeDisabledProvidersParam.Get(), SplitString(features::kDnsOverHttpsUpgradeDisabledProvidersParam.Get(),
",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
// Because SECURE mode does not allow any fallback, allow multiple retries as
// a quick hack to increase the timeout for these requests.
// TODO(crbug.com/1105138): Rethink the timeout logic to be less aggressive in
// cases where there is no fallback, without needing to make so many retries.
if (secure_dns_mode == net::SecureDnsMode::kSecure)
overrides.doh_attempts = 3;
host_resolver_manager_->SetDnsConfigOverrides(overrides); host_resolver_manager_->SetDnsConfigOverrides(overrides);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment