moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 16:18:48 -05:00
Code Issues Releases Wiki Activity

fixed up the telnet to work (using support from Linus Nielsen)

Browse Source
This commit is contained in:
Daniel Stenberg 2001-01-31 15:05:44 +00:00
parent c41c5a0ef2
commit a14aaaf23f
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/telnet.c
View File

@ -872,20 +872,22 @@ CURLcode Curl_telnet(struct connectdata *conn)
} }
} }
if(FD_ISSET(sockfd, &readfd)) if(FD_ISSET(sockfd, &readfd)) {
Curl_read(conn, sockfd, buf, BUFSIZE - 1, &nread); Curl_read(conn, sockfd, buf, BUFSIZE - 1, &nread);
/* if we receive 0 or less here, the server closed the connection and /* if we receive 0 or less here, the server closed the connection and
we bail out from this! */ we bail out from this! */
if (nread <= 0) { if (nread <= 0) {
keepon = FALSE; keepon = FALSE;
break; break;
} }
telrcv(data, (unsigned char *)buf, nread); telrcv(data, (unsigned char *)buf, nread);
}
} }
} }
return CURLE_OK; /* mark this as "no further transfer wanted" */
return Curl_Transfer(conn, -1, -1, FALSE, NULL, -1, NULL);
} }

6
lib/transfer.c
View File

@ -161,6 +161,12 @@ _Transfer(struct connectdata *c_conn)
Curl_pgrsTime(data, TIMER_PRETRANSFER); Curl_pgrsTime(data, TIMER_PRETRANSFER);
Curl_speedinit(data); Curl_speedinit(data);
if((conn->sockfd == -1) &&
(conn->writesockfd == -1)) {
/* nothing to read, nothing to write, we're already OK! */
return CURLE_OK;
}
if (!conn->getheader) { if (!conn->getheader) {
header = FALSE; header = FALSE;
if(conn->size > 0) if(conn->size > 0)