]> 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>
Thu, 19 Dec 2013 17:31:25 +0000 (10:31 -0700)
committerAlex Rousskov <rousskov@measurement-factory.com>
Thu, 19 Dec 2013 17:31:25 +0000 (10:31 -0700)
now for the upload/STOR case (the download case was handled in ftp-gw r12789).

Microsoft servers seem to favor 125 responses in some conditions.

src/client_side.cc

index 0e2691399f66d9966160e3d1fa585cbe56f756a9..fb675f9005e027d99cb397b43c30875e81fc7060 100644 (file)
@@ -5690,8 +5690,8 @@ FtpWriteForwardedReply(ClientSocketContext *context, const HttpReply *reply, Asy
     const int status = header.getInt(HDR_FTP_STATUS);
     debugs(33, 7, HERE << "status: " << status);
 
-    if (status == 150 && connState->ftp.state ==
-        ConnStateData::FTP_HANDLE_UPLOAD_REQUEST)
+    if ((status == 125 || status == 150) &&
+        connState->ftp.state == ConnStateData::FTP_HANDLE_UPLOAD_REQUEST)
         connState->readSomeFtpData();
 
     MemBuf mb;