our timeout values are longs while 'tv_sec' is int
This commit is contained in:
parent
817d17354e
commit
eb9383d49b
@ -151,7 +151,7 @@ static CURLcode AllowServerConnect(struct connectdata *conn)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* we give the server 60 seconds to connect to us, or a custom timeout */
|
/* 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;
|
dt.tv_usec = 0;
|
||||||
|
|
||||||
switch (select(sock+1, &rdset, NULL, NULL, &dt)) {
|
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;
|
bool keepon=TRUE;
|
||||||
ssize_t gotbytes;
|
ssize_t gotbytes;
|
||||||
char *ptr;
|
char *ptr;
|
||||||
int timeout; /* timeout in seconds */
|
long timeout; /* timeout in seconds */
|
||||||
struct timeval interval;
|
struct timeval interval;
|
||||||
fd_set rkeepfd;
|
fd_set rkeepfd;
|
||||||
fd_set readfd;
|
fd_set readfd;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user