diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-27 12:48:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-27 11:11:56 +0000 |
| commit | c69fdae9c762b7bdf45016bf8398f6050b7699ba (patch) | |
| tree | 7f95460374822dbb18bba1f0bad1c09a1427c8a5 /chromium/net/dns | |
| parent | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (diff) | |
| download | qtwebengine-chromium-c69fdae9c762b7bdf45016bf8398f6050b7699ba.tar.gz | |
BASELINE: Update Chromium to 69.0.3497.113
Change-Id: I4fb3f077682cc7eda51e9046981dcd40e0183cd6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/net/dns')
| -rw-r--r-- | chromium/net/dns/host_resolver_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/net/dns/host_resolver_impl.cc b/chromium/net/dns/host_resolver_impl.cc index 8d609552e4d..2d2db7db77c 100644 --- a/chromium/net/dns/host_resolver_impl.cc +++ b/chromium/net/dns/host_resolver_impl.cc @@ -1461,8 +1461,9 @@ class HostResolverImpl::Job : public PrioritizedDispatcher::Job, DNS_HISTOGRAM_BY_PRIORITY("Net.DNS.JobQueueTimeAfterChange", priority(), queue_time_after_change); - bool system_only = - (key_.host_resolver_flags & HOST_RESOLVER_SYSTEM_ONLY) != 0; + bool system_only = (key_.host_resolver_flags & + (HOST_RESOLVER_CANONNAME | + HOST_RESOLVER_SYSTEM_ONLY)) != 0; // Caution: Job::Start must not complete synchronously. if (!system_only && had_dns_config_ && |