---------------------
PatchSet 355 
Date: 2000/05/31 09:58:50
Author: hno
Branch: hno-devel
Tag: (none) 
Log:
It looks like ftpAcceptDataConnection could accept doing things with a
aborted request. Trying to send data to an aborted request will trigger
an assertion in storeAppend.

Members: 
	src/ftp.c:1.1.1.3.10.3.2.1->1.1.1.3.10.3.2.2 

Index: squid/src/ftp.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/ftp.c,v
retrieving revision 1.1.1.3.10.3.2.1
retrieving revision 1.1.1.3.10.3.2.2
diff -u -r1.1.1.3.10.3.2.1 -r1.1.1.3.10.3.2.2
--- squid/src/ftp.c	16 May 2000 18:53:53 -0000	1.1.1.3.10.3.2.1
+++ squid/src/ftp.c	31 May 2000 09:58:50 -0000	1.1.1.3.10.3.2.2
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.c,v 1.1.1.3.10.3.2.1 2000/05/16 18:53:53 hno Exp $
+ * $Id: ftp.c,v 1.1.1.3.10.3.2.2 2000/05/31 09:58:50 hno Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -1876,6 +1876,11 @@
     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());