From: Christos Tsantilas <chtsanti@users.sourceforge.net>
Date: Thu, 19 Dec 2013 17:31:25 +0000 (-0700)
Subject: Recognize FTP 125 (Data connection already open) as we do 150 response,
X-Git-Tag: SQUID_3_5_0_1~117^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d1baaf52425160c8e2f26b105ad5571774d8d42;p=thirdparty%2Fsquid.git

Recognize FTP 125 (Data connection already open) as we do 150 response,
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.
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 0e2691399f..fb675f9005 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -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;