]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Drop duplicate code on FTP data accept
authorAmos Jeffries <squid3@treenet.co.nz>
Tue, 28 Jun 2011 01:39:23 +0000 (13:39 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Tue, 28 Jun 2011 01:39:23 +0000 (13:39 +1200)
src/ftp.cc

index 8faaae7b524fbb411ad82e5b73343fcb6c1ebc18..ddeffbca63bf51b232414862553e17182655deb3 100644 (file)
@@ -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.