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 fe9012aadadedfa421632cbb021ab92afcc246a0..d3d66f9e5f0334ef53c8bf726e17f740abdeb18c 100644 (file)
--- 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)