diff options
| author | Lucas Clemente Vella <lvella@gmail.com> | 2021-04-24 20:04:53 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-05-20 16:58:31 +0200 |
| commit | 84d2839740ca78041ac7419d9aaeac55c1e1c729 (patch) | |
| tree | aee6202a7815b0cce0e1a2b9179c3b4421e7fb9a /include | |
| parent | ac54b10933749d4c17d9568532ff2f1ed64c119a (diff) | |
| download | curl-84d2839740ca78041ac7419d9aaeac55c1e1c729.tar.gz | |
CURLOPT_IPRESOLVE: preventing wrong IP version from being used
In some situations, it was possible that a transfer was setup to
use an specific IP version, but due do DNS caching or connection
reuse, it ended up using a different IP version from requested.
This commit changes the effect of CURLOPT_IPRESOLVE from simply
restricting address resolution to preventing the wrong connection
type being used, when choosing a connection from the pool, and
to restricting what addresses could be used when establishing
a new connection.
It is important that all addresses versions are resolved, even if
not used in that transfer in particular, because the result is
cached, and could be useful for a different transfer with a
different CURLOPT_IPRESOLVE setting.
Closes #6853
Diffstat (limited to 'include')
| -rw-r--r-- | include/curl/curl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index e8f9db52f..97de8c88a 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -1466,8 +1466,8 @@ typedef enum { #define CURLOPT_SERVER_RESPONSE_TIMEOUT CURLOPT_FTP_RESPONSE_TIMEOUT /* Set this option to one of the CURL_IPRESOLVE_* defines (see below) to - tell libcurl to resolve names to those IP versions only. This only has - affect on systems with support for more than one, i.e IPv4 _and_ IPv6. */ + tell libcurl to use those IP versions only. This only has effect on + systems with support for more than one, i.e IPv4 _and_ IPv6. */ CURLOPT(CURLOPT_IPRESOLVE, CURLOPTTYPE_VALUES, 113), /* Set this option to limit the size of a file that will be downloaded from @@ -2135,10 +2135,10 @@ typedef enum { /* Below here follows defines for the CURLOPT_IPRESOLVE option. If a host name resolves addresses using more than one IP protocol version, this option might be handy to force libcurl to use a specific IP version. */ -#define CURL_IPRESOLVE_WHATEVER 0 /* default, resolves addresses to all IP +#define CURL_IPRESOLVE_WHATEVER 0 /* default, uses addresses to all IP versions that your system allows */ -#define CURL_IPRESOLVE_V4 1 /* resolve to IPv4 addresses */ -#define CURL_IPRESOLVE_V6 2 /* resolve to IPv6 addresses */ +#define CURL_IPRESOLVE_V4 1 /* uses only IPv4 addresses/connections */ +#define CURL_IPRESOLVE_V6 2 /* uses only IPv6 addresses/connections */ /* three convenient "aliases" that follow the name scheme better */ #define CURLOPT_RTSPHEADER CURLOPT_HTTPHEADER |