From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 28 Jun 2011 01:39:23 +0000 (+1200)
Subject: Drop duplicate code on FTP data accept
X-Git-Tag: take08~55^2~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c69a51c4481a92a62db279100452f862e6c477b3;p=thirdparty%2Fsquid.git

Drop duplicate code on FTP data accept
---

diff --git a/src/ftp.cc b/src/ftp.cc
index 8faaae7b52..ddeffbca63 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -2945,14 +2945,6 @@ FtpStateData::ftpAcceptDataConnection(const CommAcceptCbParams &io)
         return;
     }
 
-    if (io.flag != COMM_OK) {
-        data.close();
-        debugs(9, DBG_IMPORTANT, "FTP AcceptDataConnection: FD " << io.fd << ": " << xstrerr(io.xerrno));
-        /** \todo Need to send error message on control channel*/
-        ftpFail(this);
-        return;
-    }
-
     /* data listening conn is no longer even open. abort. */
     if (!Comm::IsConnOpen(data.conn)) {
         data.clear(); // ensure that it's cleared and not just closed.