From: Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Date: Mon, 1 Jul 2013 12:38:32 +0000 (+0400)
Subject: FTP gateway: web browsers compatibility fix.
X-Git-Tag: SQUID_3_5_0_1~117^2~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29268829cd569ef4e05566a61933d1ea983570ea;p=thirdparty%2Fsquid.git

FTP gateway: web browsers compatibility fix.

Do not forward server greeting to client as a preliminary reply
because it may confuse web browsers.
---

diff --git a/src/FtpGatewayServer.cc b/src/FtpGatewayServer.cc
index fe9012aada..d3d66f9e5f 100644
--- a/src/FtpGatewayServer.cc
+++ b/src/FtpGatewayServer.cc
@@ -340,8 +340,14 @@ ServerStateData::readGreeting()
         fwd->request->clientConnectionManager->ftp.readGreeting = true;
         if (clientState() == ConnStateData::FTP_BEGIN)
             clientState(ConnStateData::FTP_CONNECTED);
-        ctrl.replycode = 120; // change status for forwarded server greeting
-        forwardPreliminaryReply(&ServerStateData::start);
+
+        // Do not forward server greeting to client as a preliminary
+        // reply because it may confuse web browsers.  Should we
+        // forward greeting as part of the final reply?
+        //ctrl.replycode = 120; // change status for forwarded server greeting
+        //forwardPreliminaryReply(&ServerStateData::start);
+
+        start();
         break;
     case 120:
         if (NULL != ctrl.message)