Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1077)

Unified Diff: net/dns/host_resolver_impl.cc

Issue 23181010: Fast-fail WPAD detection. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Re-fix MockHostResolver Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/address_family.h ('k') | net/dns/host_resolver_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/host_resolver_impl.cc
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 90b7d36a2cf7e44f43ae44f84f053078f68db8a1..e4098d003be0468390ddc575ca1555cbc61a210b 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -1455,8 +1455,12 @@ class HostResolverImpl::Job : public PrioritizedDispatcher::Job,
queue_time_after_change);
}
+ bool system_only =
+ (key_.host_resolver_flags & HOST_RESOLVER_SYSTEM_ONLY) != 0;
+
// Caution: Job::Start must not complete synchronously.
- if (had_dns_config_ && !ResemblesMulticastDNSName(key_.hostname)) {
+ if (!system_only && had_dns_config_ &&
+ !ResemblesMulticastDNSName(key_.hostname)) {
StartDnsTask();
} else {
StartProcTask();
« no previous file with comments | « net/base/address_family.h ('k') | net/dns/host_resolver_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698