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

our timeout values are longs while 'tv_sec' is int

parent 817d1735

lib/ftp.c

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static CURLcode AllowServerConnect(struct connectdata *conn) 
  }



  /* we give the server 60 seconds to connect to us, or a custom timeout */

  dt.tv_sec = timeout?timeout:60;

  dt.tv_sec = (int)(timeout?timeout:60);

  dt.tv_usec = 0;



  switch (select(sock+1, &rdset, NULL, NULL, &dt)) {
@@ -216,7 +216,7 @@ CURLcode Curl_GetFTPResponse(ssize_t *nreadp, /* return number of bytes read */ 
  bool keepon=TRUE;

  ssize_t gotbytes;

  char *ptr;

  int timeout;              /* timeout in seconds */

  long timeout;              /* timeout in seconds */

  struct timeval interval;

  fd_set rkeepfd;

  fd_set readfd;