From: wessels <> Date: Wed, 11 Feb 1998 01:39:36 +0000 (+0000) Subject: Changed error message generated when we read 0 bytes from the FTP X-Git-Tag: SQUID_3_0_PRE1~4122 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1614c049aa7494cb3b67d79b084f028d23d1943d;p=thirdparty%2Fsquid.git Changed error message generated when we read 0 bytes from the FTP server control socket. Instead of a read error, call it an FTP protocol error. Thats not really great either. maybe we need a new ERR_ type. --- diff --git a/src/ftp.cc b/src/ftp.cc index 331947ecd1..73c34eae2e 100644 --- a/src/ftp.cc +++ b/src/ftp.cc @@ -1,6 +1,6 @@ /* - * $Id: ftp.cc,v 1.191 1998/02/04 07:22:18 wessels Exp $ + * $Id: ftp.cc,v 1.192 1998/02/10 18:39:36 wessels Exp $ * * DEBUG: section 9 File Transfer Protocol (FTP) * AUTHOR: Harvest Derived @@ -1131,12 +1131,11 @@ ftpReadControlReply(int fd, void *data) return; } if (len == 0) { - debug(9, 1) ("ftpReadControlReply: FD %d Read 0 bytes\n", fd); if (entry->store_status == STORE_PENDING) { storeReleaseRequest(entry); if (entry->mem_obj->inmem_hi == 0) { - err = errorCon(ERR_READ_ERROR, HTTP_INTERNAL_SERVER_ERROR); - err->xerrno = errno; + err = errorCon(ERR_FTP_FAILURE, HTTP_INTERNAL_SERVER_ERROR); + err->xerrno = 0; err->request = requestLink(ftpState->request); errorAppendEntry(entry, err); }