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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Remove SetHostResolverForTesting 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
« net/base/address_family.h ('K') | « net/base/address_family.h ('k') | net/dns/mock_host_resolver.cc » ('j') | net/proxy/proxy_script_decider.cc » ('J')
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 d10949f23cd9ee91fbef9aa8e909985a715a1563..f91f4c536eced3feda6cc2aa7ab11aeda3271664 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -1361,8 +1361,11 @@ class HostResolverImpl::Job : public PrioritizedDispatcher::Job {
queue_time_after_change);
}
+ bool native_only = key_.host_resolver_flags & HOST_RESOLVER_SYSTEM_ONLY;
szym 2013/09/16 22:15:54 |system_only|
Elly Fong-Jones 2013/09/17 19:20:23 Done.
+
// Caution: Job::Start must not complete synchronously.
- if (had_dns_config_ && !ResemblesMulticastDNSName(key_.hostname)) {
+ if (!native_only && had_dns_config_ &&
+ !ResemblesMulticastDNSName(key_.hostname)) {
StartDnsTask();
} else {
StartProcTask();
« net/base/address_family.h ('K') | « net/base/address_family.h ('k') | net/dns/mock_host_resolver.cc » ('j') | net/proxy/proxy_script_decider.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698