moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-04 18:38:03 -05:00
Code Issues Releases Wiki Activity

Avoid timeout restart when signal caught while awaiting socket and stdin events

Browse Source
This commit is contained in:
Yang Tse 2008-02-20 17:17:18 +00:00
parent 4ae644e427
commit 064eebeaf1
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/server/sockfilt.c
View File

@ -164,6 +164,7 @@ static bool juggle(curl_socket_t *sockfdp,
curl_socket_t listenfd, curl_socket_t listenfd,
enum sockmode *mode) enum sockmode *mode)
{ {
struct timeval initial_tv;
struct timeval timeout; struct timeval timeout;
fd_set fds_read; fd_set fds_read;
fd_set fds_write; fd_set fds_write;
@ -175,6 +176,8 @@ static bool juggle(curl_socket_t *sockfdp,
ssize_t nread_socket; ssize_t nread_socket;
ssize_t bytes_written; ssize_t bytes_written;
ssize_t buffer_len; ssize_t buffer_len;
long pending_ms;
long timeout_ms = 120 * 1000;
/* 'buffer' is this excessively large only to be able to support things like /* 'buffer' is this excessively large only to be able to support things like
test 1003 which tests exceedingly large server response lines */ test 1003 which tests exceedingly large server response lines */
@ -188,9 +191,6 @@ static bool juggle(curl_socket_t *sockfdp,
return FALSE; return FALSE;
#endif #endif
timeout.tv_sec = 120;
timeout.tv_usec = 0;
FD_ZERO(&fds_read); FD_ZERO(&fds_read);
FD_ZERO(&fds_write); FD_ZERO(&fds_write);
FD_ZERO(&fds_err); FD_ZERO(&fds_err);
@ -246,9 +246,23 @@ static bool juggle(curl_socket_t *sockfdp,
} /* switch(*mode) */ } /* switch(*mode) */
pending_ms = timeout_ms;
initial_tv = curlx_tvnow();
do { do {
rc = select(maxfd + 1, &fds_read, &fds_write, &fds_err, &timeout); timeout.tv_sec = pending_ms / 1000;
} while((rc == -1) && (SOCKERRNO == EINTR)); timeout.tv_usec = (pending_ms % 1000) * 1000;
rc = select((int)maxfd + 1, &fds_read, &fds_write, &fds_err, &timeout);
if(rc != -1)
break;
if(SOCKERRNO != EINTR)
break;
pending_ms = timeout_ms - curlx_tvdiff(curlx_tvnow(), initial_tv);
if(pending_ms <= 0) {
rc = 0;
break;
}
} while(rc == -1);
switch(rc) { switch(rc) {
case -1: case -1: