diff options
Diffstat (limited to 'lib/transfer.c')
| -rw-r--r-- | lib/transfer.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/transfer.c b/lib/transfer.c index 2985cd654..4111653b1 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -173,7 +173,7 @@ CURLcode Curl_readwrite(struct connectdata *conn, { struct Curl_transfer_keeper *k = &conn->keep; struct SessionHandle *data = conn->data; - CURLcode result; + int result; ssize_t nread; /* number of bytes read */ int didwhat=0; @@ -181,18 +181,21 @@ CURLcode Curl_readwrite(struct connectdata *conn, if((k->keepon & KEEP_READ) && FD_ISSET(conn->sockfd, &k->readfd)) { - if ((k->bytecount == 0) && (k->writebytecount == 0)) - Curl_pgrsTime(data, TIMER_STARTTRANSFER); - - didwhat |= KEEP_READ; - /* read! */ result = Curl_read(conn, conn->sockfd, k->buf, BUFSIZE -1, &nread); - if(result) + if(0>result) + break; /* get out of loop */ + if(result>0) return result; + if ((k->bytecount == 0) && (k->writebytecount == 0)) + Curl_pgrsTime(data, TIMER_STARTTRANSFER); + + + didwhat |= KEEP_READ; + /* NULL terminate, allowing string ops to be used */ if (0 < (signed int) nread) k->buf[nread] = 0; |