Commit c64fca1b authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Fixed the FTP response reader to deal with timeouts better. Previously it 

would reset the timeout for each incoming data, which would make veeery
slow responses be allowed to take even more time since the timeout would only
be reached if the time between two received data chunks was longer than the
set timeout value...
parent 15b2a3af

lib/ftp.c

+11 −10
Original line number Diff line number Diff line
@@ -210,16 +210,6 @@ int Curl_GetFTPResponse(char *buf, 
  if (ftpcode)

    *ftpcode = 0; /* 0 for errors */



  if(data->set.timeout) {

    /* if timeout is requested, find out how much remaining time we have */

    timeout = data->set.timeout - /* timeout time */

      Curl_tvdiff(Curl_tvnow(), conn->now)/1000; /* spent time */

    if(timeout <=0 ) {

      failf(data, "Transfer aborted due to timeout");

      return -SELECT_TIMEOUT; /* already too little time */

    }

  }



  FD_ZERO (&readfd);		/* clear it */

  FD_SET (sockfd, &readfd);     /* read socket */
@@ -235,6 +225,17 @@ int Curl_GetFTPResponse(char *buf, 
  keepon=TRUE;



  while((nread<BUFSIZE) && (keepon && !error)) {

    /* check and reset timeout value every lap */

    if(data->set.timeout) {

      /* if timeout is requested, find out how much remaining time we have */

      timeout = data->set.timeout - /* timeout time */

        Curl_tvdiff(Curl_tvnow(), conn->now)/1000; /* spent time */

      if(timeout <=0 ) {

        failf(data, "Transfer aborted due to timeout");

        return -SELECT_TIMEOUT; /* already too little time */

      }

    }



    if(!ftp->cache) {

      readfd = rkeepfd;		   /* set every lap */

      interval.tv_sec = timeout;