From: wessels <>
Date: Fri, 24 Oct 1997 02:41:35 +0000 (+0000)
Subject: Dont storeAbort() if we're STORE_OK
X-Git-Tag: SQUID_3_0_PRE1~4727
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43d9de30f9b2a2ce0fcec60c2b8cca02f3f34695;p=thirdparty%2Fsquid.git

Dont storeAbort() if we're STORE_OK
---

diff --git a/src/ftp.cc b/src/ftp.cc
index 06e38e678e..634c594274 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.146 1997/10/23 16:38:10 wessels Exp $
+ * $Id: ftp.cc,v 1.147 1997/10/23 20:41:35 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -967,7 +967,8 @@ ftpWriteCommandCallback(int fd, char *buf, int size, int errflag, void *data)
 	    err->request = requestLink(ftpState->request);
 	    errorAppendEntry(entry, err);
 	}
-	storeAbort(entry, 0);
+	if (entry->store_status == STORE_PENDING)
+	    storeAbort(entry, 0);
 	comm_close(fd);
     }
 }
@@ -1045,7 +1046,8 @@ ftpReadControlReply(int fd, void *data)
 		err->request = requestLink(ftpState->request);
 		errorAppendEntry(entry, err);
 	    }
-	    storeAbort(entry, 0);
+	    if (entry->store_status == STORE_PENDING)
+		storeAbort(entry, 0);
 	    comm_close(fd);
 	}
 	return;