summaryrefslogtreecommitdiffstats
path: root/net/proxy/proxy_resolver_js_bindings.cc
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 04:35:31 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-23 04:35:31 +0000
commitdd03033d9669dbad7e6ac3cfaa220593c0534a2d (patch)
treef5223738273e1d6052bf0e6599d6bcb5d85d557b /net/proxy/proxy_resolver_js_bindings.cc
parent36e93a7796e1551fafeaaed832f166a2a6d9bb2b (diff)
downloadchromium_src-dd03033d9669dbad7e6ac3cfaa220593c0534a2d.zip
chromium_src-dd03033d9669dbad7e6ac3cfaa220593c0534a2d.tar.gz
chromium_src-dd03033d9669dbad7e6ac3cfaa220593c0534a2d.tar.bz2
Refactor: Address some style comments from a review (which missed the original check-in).
Review URL: http://codereview.chromium.org/322009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy/proxy_resolver_js_bindings.cc')
-rw-r--r--net/proxy/proxy_resolver_js_bindings.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/proxy/proxy_resolver_js_bindings.cc b/net/proxy/proxy_resolver_js_bindings.cc
index cbeba08..f9ea5ae 100644
--- a/net/proxy/proxy_resolver_js_bindings.cc
+++ b/net/proxy/proxy_resolver_js_bindings.cc
@@ -110,10 +110,13 @@ class DefaultJSBindings : public ProxyResolverJSBindings {
return std::string();
// Do a sync resolve of the hostname.
- // Disable IPv6 results, see http://crbug.com/24641 for motivation.
+ // Disable IPv6 results. We do this because Internet Explorer does it --
+ // consequently a lot of existing PAC scripts assume they will only get
+ // IPv4 results, and will misbehave if they get an IPv6 result.
+ // See http://crbug.com/24641 for more details.
net::AddressList address_list;
int result = host_resolver_->Resolve(host,
- ADDRESS_FAMILY_IPV4_ONLY,
+ ADDRESS_FAMILY_IPV4,
&address_list);
if (result != OK)