Fix CURLOPT_DNS_SHUFFLE_ADDRESSES #3110
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
bagder
approved these changes
Oct 7, 2018
| @@ -455,7 +455,7 @@ Curl_cache_addr(struct Curl_easy *data, | |||
| /* shuffle addresses if requested */ | |||
| if(data->set.dns_shuffle_addresses) { | |||
| CURLcode result = Curl_shuffle_addr(data, &addr); | |||
| if(!result) | |||
| if(result != CURLE_OK) | |||
There was a problem hiding this comment.
We prefer to use plain if(result) in the code for this check (used everywhere)! But otherwise it looks good.
|
Thanks! Getting a test case that covers this would of course be ideal, but I can't think of a good way to do it... |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Further error handling was added during merging of #1694, changing the return type of
Curl_shuffle_addrfrom void toCURLcode. Unfortunately an incorrect check on the return type made its way in, causingCurl_cache_addrto always fail ifCURLOPT_DNS_SHUFFLE_ADDRESSESis enabled.The unit test for
CURLOPT_DNS_SHUFFLE_ADDRESSES(1608) did not catch this because it does not callCurl_cache_addr, only verifying that:curl_easy_setoptsucceedsCurl_shuffle_addrreturns successThis PR just fixes the one return value comparison mentioned and things seem to work as expected after that. Let me know if you think it would be worth any test changes, but this can probably just be considered the one time introductory pain of a rarely used new option :)