diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 01:34:40 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 01:34:40 +0000 |
| commit | 7ca4c2dbb99fb595ef72c66e5435895019bda7e2 (patch) | |
| tree | 55a7147a1a9b7c35600e9f39ee144ac79e581681 /net/proxy | |
| parent | e6bbb5c51953ff1546dff1d23d3e5209caf8c088 (diff) | |
| download | chromium_src-7ca4c2dbb99fb595ef72c66e5435895019bda7e2.zip chromium_src-7ca4c2dbb99fb595ef72c66e5435895019bda7e2.tar.gz chromium_src-7ca4c2dbb99fb595ef72c66e5435895019bda7e2.tar.bz2 | |
Add an explanation for the divergenace from WPAD DNS protocol.
Review URL: http://codereview.chromium.org/6538009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/init_proxy_resolver.cc | 12 | ||||
| -rw-r--r-- | net/proxy/init_proxy_resolver.h | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/net/proxy/init_proxy_resolver.cc b/net/proxy/init_proxy_resolver.cc index c60dd21..9091168 100644 --- a/net/proxy/init_proxy_resolver.cc +++ b/net/proxy/init_proxy_resolver.cc @@ -18,6 +18,16 @@ namespace net { // This is the hard-coded location used by the DNS portion of web proxy // auto-discovery. +// +// Note that we not use DNS devolution to find the WPAD host, since that could +// be dangerous should our top level domain registry become out of date. +// +// Instead we directly resolve "wpad", and let the operating system apply the +// DNS suffix search paths. This is the same approach taken by Firefox, and +// compatibility hasn't been an issue. +// +// For more details, also check out this comment: +// http://code.google.com/p/chromium/issues/detail?id=18575#c20 static const char kWpadUrl[] = "http://wpad/wpad.dat"; InitProxyResolver::InitProxyResolver(ProxyResolver* resolver, @@ -72,7 +82,7 @@ int InitProxyResolver::Init(const ProxyConfig& config, } // Initialize the fallback rules. -// (1) WPAD +// (1) WPAD (DNS). // (2) Custom PAC URL. InitProxyResolver::UrlList InitProxyResolver::BuildPacUrlsFallbackList( const ProxyConfig& config) const { diff --git a/net/proxy/init_proxy_resolver.h b/net/proxy/init_proxy_resolver.h index ec6bfc1..fd656427 100644 --- a/net/proxy/init_proxy_resolver.h +++ b/net/proxy/init_proxy_resolver.h @@ -27,7 +27,7 @@ class ProxyScriptFetcher; // // This involves trying to use PAC scripts in this order: // -// (1) WPAD if auto-detect is on. +// (1) WPAD (DNS) if auto-detect is on. // (2) Custom PAC script if a URL was given. // // If no PAC script was successfully downloaded + parsed, then it fails with |