schannel: Fix blocking timeout logic

- Fix schannel_send for the case when no timeout was set.

Prior to this change schannel would error if the socket was not ready
to send data and no timeout was set.

This commit is similar to parent commit 89dc6e0 which recently made the
same change for SOCKS, for the same reason. Basically it was not well
understood that when Curl_timeleft returns 0 it is not a timeout of 0 ms
but actually means no timeout.

Fixes https://github.com/curl/curl/issues/5177
Closes https://github.com/curl/curl/pull/5221
This commit is contained in:
Andrew Kurushin 2020-04-12 13:07:51 +03:00 коммит произвёл Jay Satiro
Родитель 0510cce8c0
Коммит c35af29222
1 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -1631,13 +1631,13 @@ schannel_send(struct connectdata *conn, int sockindex,
/* send entire message or fail */
while(len > (size_t)written) {
ssize_t this_write;
timediff_t timeleft;
timediff_t timeout_ms;
int what;
this_write = 0;
timeleft = Curl_timeleft(conn->data, NULL, FALSE);
if(timeleft < 0) {
timeout_ms = Curl_timeleft(conn->data, NULL, FALSE);
if(timeout_ms < 0) {
/* we already got the timeout */
failf(conn->data, "schannel: timed out sending data "
"(bytes sent: %zd)", written);
@ -1645,9 +1645,9 @@ schannel_send(struct connectdata *conn, int sockindex,
written = -1;
break;
}
if(timeleft > TIME_T_MAX)
timeleft = TIME_T_MAX;
what = SOCKET_WRITABLE(conn->sock[sockindex], (time_t)timeleft);
if(!timeout_ms || timeout_ms > TIME_T_MAX)
timeout_ms = TIME_T_MAX;
what = SOCKET_WRITABLE(conn->sock[sockindex], (time_t)timeout_ms);
if(what < 0) {
/* fatal error */
failf(conn->data, "select/poll on SSL socket, errno: %d", SOCKERRNO);