Merge branch 'release' into Pale_Moon-release

1 files changed, 14 insertions, 4 deletions

diff --git a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
index 0dae7ca92..6904bc33b 100644
--- a/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
+++ b/netwerk/protocol/ftp/nsFtpConnectionThread.cpp
@@ -82,6 +82,9 @@ nsFtpState::nsFtpState()
     , mAnonymous(true)
     , mRetryPass(false)
     , mStorReplyReceived(false)
+    , mRlist1xxReceived(false)
+    , mRstor1xxReceived(false)
+    , mRretr1xxReceived(false)  
     , mInternalError(NS_OK)
     , mReconnectAndLoginAgain(false)
     , mCacheConnection(true)
@@ -1153,15 +1156,18 @@ nsFtpState::S_list() {
 FTP_STATE
 nsFtpState::R_list() {
     if (mResponseCode/100 == 1) {
+      mRlist1xxReceived = true;
+
         // OK, time to start reading from the data connection.
         if (mDataStream && HasPendingCallback())
             mDataStream->AsyncWait(this, 0, 0, CallbackTarget());
         return FTP_READ_BUF;
     }
 
-    if (mResponseCode/100 == 2) {
+    if (mResponseCode/100 == 2 && mRlist1xxReceived) {
         //(DONE)
         mNextState = FTP_COMPLETE;
+        mRlist1xxReceived = false;
         return FTP_COMPLETE;
     }
     return FTP_ERROR;
@@ -1181,13 +1187,16 @@ nsFtpState::S_retr() {
 
 FTP_STATE
 nsFtpState::R_retr() {
-    if (mResponseCode/100 == 2) {
+    if (mResponseCode/100 == 2 && mRretr1xxReceived) {
         //(DONE)
         mNextState = FTP_COMPLETE;
+        mRretr1xxReceived = false;
         return FTP_COMPLETE;
     }
 
     if (mResponseCode/100 == 1) {
+        mRretr1xxReceived = true;
+
         if (mDataStream && HasPendingCallback())
             mDataStream->AsyncWait(this, 0, 0, CallbackTarget());
         return FTP_READ_BUF;
@@ -1262,7 +1271,7 @@ nsFtpState::S_stor() {
 
 FTP_STATE
 nsFtpState::R_stor() {
-    if (mResponseCode/100 == 2) {
+    if (mResponseCode/100 == 2 && mRstor1xxReceived) {
         //(DONE)
         mNextState = FTP_COMPLETE;
         mStorReplyReceived = true;
@@ -1270,11 +1279,12 @@ nsFtpState::R_stor() {
         // Call Close() if it was not called in nsFtpState::OnStoprequest()
         if (!mUploadRequest && !IsClosed())
             Close();
-
+        mRstor1xxReceived = false;
         return FTP_COMPLETE;
     }
 
     if (mResponseCode/100 == 1) {
+        mRstor1xxReceived = true;
         LOG(("FTP:(%x) writing on DT\n", this));
         return FTP_READ_BUF;
     }