Index: net/ftp/ftp_network_transaction.cc |
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc |
index 471e8c920842dbf45891ad4c9ab3fc3bb247a164..f6b7203b0316fc52508cbf23bc4633ee218bd182 100644 |
--- a/net/ftp/ftp_network_transaction.cc |
+++ b/net/ftp/ftp_network_transaction.cc |
@@ -1187,22 +1187,7 @@ int FtpNetworkTransaction::DoDataConnect() { |
} |
int FtpNetworkTransaction::DoDataConnectComplete(int result) { |
- if (result == ERR_CONNECTION_TIMED_OUT && use_epsv_) { |
- // It's possible we hit a broken server, sadly. Fall back to PASV. |
- // TODO(phajdan.jr): remember it for future transactions with this server. |
- // TODO(phajdan.jr): write a test for this code path. |
- use_epsv_ = false; |
- next_state_ = STATE_CTRL_WRITE_PASV; |
- return OK; |
- } |
- |
- // Only record the connection error after we've applied all our fallbacks. |
- // We want to capture the final error, one we're not going to recover from. |
RecordDataConnectionError(result); |
- |
- if (result != OK) |
- return Stop(result); |
- |
next_state_ = STATE_CTRL_WRITE_SIZE; |
return OK; |
} |