summaryrefslogtreecommitdiffstats
path: root/net/ftp/ftp_network_transaction.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/ftp/ftp_network_transaction.cc')
-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_);
}