hostip: CURL_DISABLE_SHUFFLE_DNS
This commit is contained in:
Родитель
1f8a584f6a
Коммит
3cfcdf08d8
|
@ -334,9 +334,9 @@ Curl_fetch_addr(struct connectdata *conn,
|
||||||
return dns;
|
return dns;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef CURL_DISABLE_SHUFFLE_DNS
|
||||||
UNITTEST CURLcode Curl_shuffle_addr(struct Curl_easy *data,
|
UNITTEST CURLcode Curl_shuffle_addr(struct Curl_easy *data,
|
||||||
Curl_addrinfo **addr);
|
Curl_addrinfo **addr);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Curl_shuffle_addr() shuffles the order of addresses in a 'Curl_addrinfo'
|
* Curl_shuffle_addr() shuffles the order of addresses in a 'Curl_addrinfo'
|
||||||
* struct by re-linking its linked list.
|
* struct by re-linking its linked list.
|
||||||
|
@ -401,6 +401,7 @@ UNITTEST CURLcode Curl_shuffle_addr(struct Curl_easy *data,
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Curl_cache_addr() stores a 'Curl_addrinfo' struct in the DNS cache.
|
* Curl_cache_addr() stores a 'Curl_addrinfo' struct in the DNS cache.
|
||||||
|
@ -422,12 +423,14 @@ Curl_cache_addr(struct Curl_easy *data,
|
||||||
struct Curl_dns_entry *dns;
|
struct Curl_dns_entry *dns;
|
||||||
struct Curl_dns_entry *dns2;
|
struct Curl_dns_entry *dns2;
|
||||||
|
|
||||||
|
#ifndef CURL_DISABLE_SHUFFLE_DNS
|
||||||
/* shuffle addresses if requested */
|
/* shuffle addresses if requested */
|
||||||
if(data->set.dns_shuffle_addresses) {
|
if(data->set.dns_shuffle_addresses) {
|
||||||
CURLcode result = Curl_shuffle_addr(data, &addr);
|
CURLcode result = Curl_shuffle_addr(data, &addr);
|
||||||
if(result)
|
if(result)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Create a new cache entry */
|
/* Create a new cache entry */
|
||||||
dns = calloc(1, sizeof(struct Curl_dns_entry));
|
dns = calloc(1, sizeof(struct Curl_dns_entry));
|
||||||
|
|
|
@ -2654,9 +2654,11 @@ static CURLcode vsetopt(struct Curl_easy *data, CURLoption option,
|
||||||
return CURLE_BAD_FUNCTION_ARGUMENT;
|
return CURLE_BAD_FUNCTION_ARGUMENT;
|
||||||
data->set.happy_eyeballs_timeout = arg;
|
data->set.happy_eyeballs_timeout = arg;
|
||||||
break;
|
break;
|
||||||
|
#ifndef CURL_DISABLE_SHUFFLE_DNS
|
||||||
case CURLOPT_DNS_SHUFFLE_ADDRESSES:
|
case CURLOPT_DNS_SHUFFLE_ADDRESSES:
|
||||||
data->set.dns_shuffle_addresses = (0 != va_arg(param, long)) ? TRUE:FALSE;
|
data->set.dns_shuffle_addresses = (0 != va_arg(param, long)) ? TRUE:FALSE;
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
case CURLOPT_DISALLOW_USERNAME_IN_URL:
|
case CURLOPT_DISALLOW_USERNAME_IN_URL:
|
||||||
data->set.disallow_username_in_url =
|
data->set.disallow_username_in_url =
|
||||||
(0 != va_arg(param, long)) ? TRUE : FALSE;
|
(0 != va_arg(param, long)) ? TRUE : FALSE;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче