summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-19 01:58:57 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-19 01:58:57 +0000
commit61b233a357f91b67bc4f363cd9818a7c28ab796b (patch)
tree8659c6b1540129a21c682e8319f1cbd93dac3a82 /net
parentbcfb4a1f10406c9d4b5df0001718aa768cdaa171 (diff)
downloadchromium_src-61b233a357f91b67bc4f363cd9818a7c28ab796b.zip
chromium_src-61b233a357f91b67bc4f363cd9818a7c28ab796b.tar.gz
chromium_src-61b233a357f91b67bc4f363cd9818a7c28ab796b.tar.bz2
Disable IPv6 in FTP until we have implemented the IPv6 extensions for FTP
specified in RFC 2428. R=eroman,phajdan.jr BUG=32945 TEST=ftp://ftp.netbsd.org/ should work on a machine with dual IPv4/IPv6 connectivity. Review URL: http://codereview.chromium.org/592001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/ftp/ftp_network_transaction.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index a463de8..dd8d219 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved. Use of this
+// Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this
// source code is governed by a BSD-style license that can be found in the
// LICENSE file.
@@ -503,6 +503,9 @@ int FtpNetworkTransaction::DoCtrlResolveHost() {
port = request_->url.EffectiveIntPort();
HostResolver::RequestInfo info(host, port);
+ // TODO(wtc): Until we support the FTP extensions for IPv6 specified in
+ // RFC 2428, we have to turn off IPv6 in FTP. See http://crbug.com/32945.
+ info.set_address_family(ADDRESS_FAMILY_IPV4);
// No known referrer.
return resolver_.Resolve(info, &addresses_, &io_callback_, load_log_);
}