From 98e7018599c010b56ade294942e2e7b3d58d1bb6 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 3 Feb 2013 19:09:06 +0900
Subject: Fix failure to set TCP_NODELAY on Windows

On Windows setting TCP_NODELAY after non-blocking connect fails
at least on Windows 7.
---
 src/FtpNegotiationCommand.cc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/FtpNegotiationCommand.cc')

diff --git a/src/FtpNegotiationCommand.cc b/src/FtpNegotiationCommand.cc
index a5c804b9..03827b54 100644
--- a/src/FtpNegotiationCommand.cc
+++ b/src/FtpNegotiationCommand.cc
@@ -682,8 +682,7 @@ bool FtpNegotiationCommand::preparePasvConnect() {
                     dataAddr.first.c_str(),
                     pasvPort_));
     dataSocket_.reset(new SocketCore());
-    dataSocket_->establishConnection(dataAddr.first, pasvPort_);
-    dataSocket_->setTcpNodelay(true);
+    dataSocket_->establishConnection(dataAddr.first, pasvPort_, false);
     disableReadCheckSocket();
     setWriteCheckSocket(dataSocket_);
     sequence_ = SEQ_SEND_REST_PASV;
@@ -705,7 +704,6 @@ bool FtpNegotiationCommand::resolveProxy()
                   proxyAddr_.c_str(), proxyReq->getPort()));
   dataSocket_.reset(new SocketCore());
   dataSocket_->establishConnection(proxyAddr_, proxyReq->getPort());
-  dataSocket_->setTcpNodelay(true);
   disableReadCheckSocket();
   setWriteCheckSocket(dataSocket_);
   SharedHandle<SocketRecvBuffer> socketRecvBuffer
@@ -741,7 +739,6 @@ bool FtpNegotiationCommand::sendTunnelRequest()
                           getCuid(),
                           proxyAddr_.c_str(), proxyReq->getPort()));
           dataSocket_->establishConnection(proxyAddr_, proxyReq->getPort());
-          dataSocket_->setTcpNodelay(true);
           return false;
         }
       }
@@ -870,7 +867,6 @@ bool FtpNegotiationCommand::waitConnection()
   disableReadCheckSocket();
   setReadCheckSocket(getSocket());
   dataSocket_ = serverSocket_->acceptConnection();
-  dataSocket_->setTcpNodelay(true);
   sequence_ = SEQ_NEGOTIATION_COMPLETED;
   return false;
 }
-- 
cgit