From: wessels <>
Date: Tue, 14 Jan 1997 02:29:12 +0000 (+0000)
Subject: put marker back if we find it in the middle of a FTP transfer
X-Git-Tag: SQUID_3_0_PRE1~5216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65c0dfdb9c1180c03c28c6f438b5fc33f7414ca2;p=thirdparty%2Fsquid.git

put marker back if we find it in the middle of a FTP transfer
---

diff --git a/src/ftp.cc b/src/ftp.cc
index 4357b51be1..606bad66a9 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.93 1997/01/07 20:31:21 wessels Exp $
+ * $Id: ftp.cc,v 1.94 1997/01/13 19:29:12 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -365,6 +365,12 @@ ftpReadReply(int fd, FtpStateData * data)
 	squid_error_entry(entry, ERR_CLIENT_ABORT, NULL);
 	comm_close(fd);
     } else {
+	if (data->got_marker) {
+	    /* oh, this is so gross -- we found the marker at the
+	     * end of the previous read, but theres more data!
+	     * So put the marker back in. */
+	    storeAppend(entry, MAGIC_MARKER, MAGIC_MARKER_SZ);
+	}
 	/* check for a magic marker at the end of the read */
 	data->got_marker = 0;
 	if (len >= MAGIC_MARKER_SZ) {