]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Recognize FTP 125 (Data connection already open) as we do 150 response.
authorChristos Tsantilas <chtsanti@users.sourceforge.net>
Fri, 15 Nov 2013 17:56:36 +0000 (10:56 -0700)
committerAlex Rousskov <rousskov@measurement-factory.com>
Fri, 15 Nov 2013 17:56:36 +0000 (10:56 -0700)
Microsoft servers seem to favor 125 responses in some conditions.

src/FtpGatewayServer.cc

index 21cbb74f4baa8c818b4bcaf3d0611a54136a8a82..1d10abbc0ab764e8c0bd9a3c14f433ce1ed4ab97 100644 (file)
@@ -520,7 +520,7 @@ ServerStateData::readDataReply()
     assert(clientState() == ConnStateData::FTP_HANDLE_DATA_REQUEST ||
            clientState() == ConnStateData::FTP_HANDLE_UPLOAD_REQUEST);
 
-    if (ctrl.replycode == 150) {
+    if (ctrl.replycode == 125 || ctrl.replycode == 150) {
         if (clientState() == ConnStateData::FTP_HANDLE_DATA_REQUEST)
             forwardPreliminaryReply(&ServerStateData::startDataDownload);
         else // clientState() == ConnStateData::FTP_HANDLE_UPLOAD_REQUEST