socks: Fix blocking timeout logic #5220
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Document in Curl_timeleft's comment block that returning 0 signals no timeout (ie there's infinite time left). - Fix SOCKS' Curl_blockread_all for the case when no timeout was set. Prior to this change if the timeout had a value of 0 and that was passed to SOCKET_READABLE it would return right away instead of blocking. That was likely because it was not well understood that when Curl_timeleft returns 0 it is not a timeout of 0 ms but actually means no timeout. Ref: curl#5214 (comment) Closes #xxxx
mback2k
approved these changes
Apr 12, 2020
mback2k
added a commit
to mback2k/curl
that referenced
this pull request
May 31, 2020
Now that all functions in select.[ch] take timediff_t instead of the limited time_t or int, we can remove type conversions and related preprocessor checks to silence compiler warnings. Based upon curl#5262 Related to curl#5479 Supersedes curl#5214, curl#5220 and curl#5221 Follow up to curl#5343 Closes curl#5490
mback2k
added a commit
to mback2k/curl
that referenced
this pull request
May 31, 2020
Remove obsolete type conversions to time_t or int: Now that all functions in select.[ch] take timediff_t instead of the limited time_t or int, we can remove type conversions and related preprocessor checks to silence compiler warnings. Based upon curl#5262 Supersedes curl#5214, curl#5220 and curl#5221 Follow up to curl#5343 and curl#5479 Closes curl#5490
mback2k
added a commit
to mback2k/curl
that referenced
this pull request
May 31, 2020
Now that all functions in select.[ch] take timediff_t instead of the limited time_t or int, we can remove type conversions and related preprocessor checks to silence compiler warnings. Based upon curl#5262 Supersedes curl#5214, curl#5220 and curl#5221 Follow up to curl#5343 and curl#5479 Closes curl#5490
mback2k
added a commit
to mback2k/curl
that referenced
this pull request
Jun 1, 2020
Now that all functions in select.[ch] take timediff_t instead of the limited time_t or int, we can remove type conversions and related preprocessor checks to silence compiler warnings. Based upon curl#5262 Supersedes curl#5214, curl#5220 and curl#5221 Follow up to curl#5343 and curl#5479 Closes curl#5490
mback2k
added a commit
to mback2k/curl
that referenced
this pull request
Jun 5, 2020
Now that all functions in select.[ch] take timediff_t instead of the limited int or long, we can remove type conversions and related preprocessor checks to silence compiler warnings. Avoiding conversions from time_t was already done in 842f73d. Based upon curl#5262 Supersedes curl#5214, curl#5220 and curl#5221 Follow up to curl#5343 and curl#5479 Closes curl#5490
mback2k
added a commit
that referenced
this pull request
Jun 6, 2020
Now that all functions in select.[ch] take timediff_t instead of the limited int or long, we can remove type conversions and related preprocessor checks to silence compiler warnings. Avoiding conversions from time_t was already done in 842f73d. Based upon #5262 Supersedes #5214, #5220 and #5221 Follow up to #5343 and #5479 Closes #5490
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Document in Curl_timeleft's comment block that returning 0 signals no
timeout (ie there's infinite time left).
Fix SOCKS' Curl_blockread_all for the case when no timeout was set.
Prior to this change if the timeout had a value of 0 and that was passed
to SOCKET_READABLE it would return right away instead of blocking. That
was likely because it was not well understood that when Curl_timeleft
returns 0 it is not a timeout of 0 ms but actually means no timeout.
Ref: #5214 (comment)
Closes #xxxx