summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 17:10:43 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-25 17:10:43 +0000
commit6111957ccf1ca5ea32008500ce1c3f8ccfd99ec9 (patch)
tree76dee363d93824bf7b9d1df0c1fbf0057eef2948 /net
parentd82084b5348cdc559d6a1613bc46f0b557960c92 (diff)
downloadchromium_src-6111957ccf1ca5ea32008500ce1c3f8ccfd99ec9.zip
chromium_src-6111957ccf1ca5ea32008500ce1c3f8ccfd99ec9.tar.gz
chromium_src-6111957ccf1ca5ea32008500ce1c3f8ccfd99ec9.tar.bz2
If we get a connect error in DoCtrlConnectComplete, do not advance to
the STATE_CTRL_READ state. R=ibrar,phajdan.jr BUG=http://crbug.com/4965 TEST=none Review URL: http://codereview.chromium.org/146065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19253 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/ftp/ftp_network_transaction.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ftp/ftp_network_transaction.cc b/net/ftp/ftp_network_transaction.cc
index b8acff5..098cbd0 100644
--- a/net/ftp/ftp_network_transaction.cc
+++ b/net/ftp/ftp_network_transaction.cc
@@ -362,7 +362,8 @@ int FtpNetworkTransaction::DoCtrlConnect() {
}
int FtpNetworkTransaction::DoCtrlConnectComplete(int result) {
- next_state_ = STATE_CTRL_READ;
+ if (result == OK)
+ next_state_ = STATE_CTRL_READ;
return result;
}