diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 11:32:04 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-18 13:40:17 +0000 |
| commit | 31ccca0778db85c159634478b4ec7997f6704860 (patch) | |
| tree | 3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/net/ftp | |
| parent | 248b70b82a40964d5594eb04feca0fa36716185d (diff) | |
| download | qtwebengine-chromium-31ccca0778db85c159634478b4ec7997f6704860.tar.gz | |
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/net/ftp')
| -rw-r--r-- | chromium/net/ftp/ftp_directory_listing_parser_unittest.cc | 2 | ||||
| -rw-r--r-- | chromium/net/ftp/ftp_network_transaction.cc | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc b/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc index 487aa5f0493..de08f994785 100644 --- a/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc +++ b/chromium/net/ftp/ftp_directory_listing_parser_unittest.cc @@ -176,7 +176,7 @@ const FtpTestParam kTestParams[] = { {"dir-listing-windows-2", OK}, }; -INSTANTIATE_TEST_SUITE_P(, +INSTANTIATE_TEST_SUITE_P(All, FtpDirectoryListingParserTest, testing::ValuesIn(kTestParams), TestName); diff --git a/chromium/net/ftp/ftp_network_transaction.cc b/chromium/net/ftp/ftp_network_transaction.cc index a24102f0b6c..b42305afe41 100644 --- a/chromium/net/ftp/ftp_network_transaction.cc +++ b/chromium/net/ftp/ftp_network_transaction.cc @@ -20,6 +20,7 @@ #include "net/base/escape.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" +#include "net/base/network_isolation_key.h" #include "net/base/parse_number.h" #include "net/base/port_util.h" #include "net/base/url_util.h" @@ -662,8 +663,11 @@ int FtpNetworkTransaction::DoLoop(int result) { int FtpNetworkTransaction::DoCtrlResolveHost() { next_state_ = STATE_CTRL_RESOLVE_HOST_COMPLETE; - resolve_request_ = resolver_->CreateRequest( - HostPortPair::FromURL(request_->url), net_log_, base::nullopt); + // Using an empty NetworkIsolationKey here, since FTP support is deprecated, + // and should go away soon. + resolve_request_ = + resolver_->CreateRequest(HostPortPair::FromURL(request_->url), + NetworkIsolationKey(), net_log_, base::nullopt); return resolve_request_->Start(base::BindOnce( &FtpNetworkTransaction::OnIOComplete, base::Unretained(this))); } |