generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Fixed the problem with doing a zero byte SCP transfer, verified with test

Browse Source 
case 617 (which was added by Daniel Fandrich 5 Mar 2008).
This commit is contained in:
Daniel Stenberg
2008-03-22 22:00:21 +00:00
parent 98c9a5b7f6
commit 95bd901efe
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/transfer.c
View File

@@ -397,18 +397,26 @@ CURLcode Curl_readwrite(struct connectdata *conn,
bytestoread = (size_t)totalleft;
}
/* receive data from the network! */
readrc = Curl_read(conn, conn->sockfd, k->buf, bytestoread, &nread);
if(bytestoread) {
/* receive data from the network! */
readrc = Curl_read(conn, conn->sockfd, k->buf, bytestoread, &nread);
/* subzero, this would've blocked */
if(0 > readrc)
break; /* get out of loop */
/* subzero, this would've blocked */
if(0 > readrc)
break; /* get out of loop */
/* get the CURLcode from the int */
result = (CURLcode)readrc;
/* get the CURLcode from the int */
result = (CURLcode)readrc;
if(result>0)
return result;
if(result>0)
return result;
}
else {
/* read nothing but since we wanted nothing we consider this an OK
situation to proceed from */
nread = 0;
result = CURLE_OK;
}
if((k->bytecount == 0) && (k->writebytecount == 0)) {
Curl_pgrsTime(data, TIMER_STARTTRANSFER);