mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-02-05 14:30:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjusted to make curl_multi_perform() work properly even when

Browse Source 
curl_multi_fdset() is not used.
This commit is contained in:
Daniel Stenberg 2002-05-28 14:18:36 +00:00
parent 0236bee5de
commit 99c0456872
1 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/transfer.c
View File

@ -168,6 +168,10 @@ compareheader(char *headerline, /* line to check */
return FALSE; /* no match */ return FALSE; /* no match */
} }
/* We keep this static and global since this is read-only and NEVER
changed. It should just remain a blanked-out timeout value. */
static struct timeval notimeout={0,0};
CURLcode Curl_readwrite(struct connectdata *conn, CURLcode Curl_readwrite(struct connectdata *conn,
bool *done) bool *done)
{ {
@ -177,13 +181,42 @@ CURLcode Curl_readwrite(struct connectdata *conn,
ssize_t nread; /* number of bytes read */ ssize_t nread; /* number of bytes read */
int didwhat=0; int didwhat=0;
/* These two are used only if no other select() or _fdset() have been
invoked before this. This typicly happens if you use the multi interface
and call curl_multi_perform() without calling curl_multi_fdset()
first. */
fd_set extrareadfd;
fd_set extrawritefd;
fd_set *readfdp = k->readfdp;
fd_set *writefdp = k->writefdp;
if((k->keepon & KEEP_READ) && !readfdp) {
/* reading is requested, but no socket descriptor pointer was set */
FD_ZERO(&extrareadfd);
FD_SET(conn->sockfd, &extrareadfd);
readfdp = &extrareadfd;
/* no write, no exceptions, no timeout */
select(conn->sockfd+1, readfdp, NULL, NULL, &notimeout);
}
if((k->keepon & KEEP_WRITE) && !writefdp) {
/* writing is requested, but no socket descriptor pointer was set */
FD_ZERO(&extrawritefd);
FD_SET(conn->writesockfd, &extrawritefd);
writefdp = &extrawritefd;
/* no read, no exceptions, no timeout */
select(conn->writesockfd+1, NULL, writefdp, NULL, &notimeout);
}
do { do {
/* If we still have reading to do, we check if we have a readable /* If we still have reading to do, we check if we have a readable
socket. Sometimes the reafdp is NULL, it no fd_set was done using socket. Sometimes the reafdp is NULL, it no fd_set was done using
the multi interface and then we can do nothing but to attempt a the multi interface and then we can do nothing but to attempt a
read to be sure. */ read to be sure. */
if((k->keepon & KEEP_READ) && if((k->keepon & KEEP_READ) &&
(!k->readfdp || FD_ISSET(conn->sockfd, k->readfdp))) { (FD_ISSET(conn->sockfd, readfdp))) {
/* read! */ /* read! */
result = Curl_read(conn, conn->sockfd, k->buf, result = Curl_read(conn, conn->sockfd, k->buf,
@ -755,7 +788,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
the multi interface and then we can do nothing but to attempt a the multi interface and then we can do nothing but to attempt a
write to be sure. */ write to be sure. */
if((k->keepon & KEEP_WRITE) && if((k->keepon & KEEP_WRITE) &&
(!k->writefdp || FD_ISSET(conn->writesockfd, k->writefdp)) ) { (FD_ISSET(conn->writesockfd, writefdp)) ) {
/* write */ /* write */
int i, si; int i, si;
@ -970,9 +1003,6 @@ CURLcode Curl_readwrite_init(struct connectdata *conn)
k->rkeepfd = k->readfd; k->rkeepfd = k->readfd;
k->wkeepfd = k->writefd; k->wkeepfd = k->writefd;
k->writefdp = &k->writefd; /* store the address of the set */
k->readfdp = &k->readfd; /* store the address of the set */
} }
return CURLE_OK; return CURLE_OK;
@ -1034,6 +1064,9 @@ Transfer(struct connectdata *conn)
if(!conn->getheader && data->set.no_body) if(!conn->getheader && data->set.no_body)
return CURLE_OK; return CURLE_OK;
k->writefdp = &k->writefd; /* store the address of the set */
k->readfdp = &k->readfd; /* store the address of the set */
while (!done) { while (!done) {
struct timeval interval; struct timeval interval;
k->readfd = k->rkeepfd; /* set these every lap in the loop */ k->readfd = k->rkeepfd; /* set these every lap in the loop */