From b044a7ebe2a80a7943d1e5cbd146b286570079fe Mon Sep 17 00:00:00 2001 From: hno <> Date: Wed, 31 May 2000 16:00:24 +0000 Subject: [PATCH] Possible fix for storeAppend "e->store_status == STORE_PENDING" assertion when called via ftpAcceptDataConnection. --- src/ftp.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ftp.cc b/src/ftp.cc index 679bb5126f..53fed3d1f8 100644 --- a/src/ftp.cc +++ b/src/ftp.cc @@ -1,6 +1,6 @@ /* - * $Id: ftp.cc,v 1.293 2000/05/16 07:06:04 wessels Exp $ + * $Id: ftp.cc,v 1.294 2000/05/31 10:00:24 hno Exp $ * * DEBUG: section 9 File Transfer Protocol (FTP) * AUTHOR: Harvest Derived @@ -1876,6 +1876,11 @@ ftpAcceptDataConnection(int fd, void *data) struct sockaddr_in my_peer, me; debug(9, 3) ("ftpAcceptDataConnection\n"); + if (EBIT_TEST(ftpState->entry->flags, ENTRY_ABORTED)) { + comm_close(ftpState->ctrl.fd); + return; + } + fd = comm_accept(fd, &my_peer, &me); if (fd < 0) { debug(9, 1) ("ftpHandleDataAccept: comm_accept(%d): %s", fd, xstrerror()); -- 2.47.3