diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-05-17 13:17:07 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-05-17 13:17:07 +0200 |
| commit | ab5a68937be1ef3c8d941f5b42c48939c1005512 (patch) | |
| tree | b5b5233eef94b70f02d8b82370219b3e4b2e913b | |
| parent | 9f475f7b9dfb663350680da8f298a84c77bb6057 (diff) | |
| download | gnurl-ab5a68937be1ef3c8d941f5b42c48939c1005512.tar.gz gnurl-ab5a68937be1ef3c8d941f5b42c48939c1005512.tar.bz2 gnurl-ab5a68937be1ef3c8d941f5b42c48939c1005512.zip | |
docs: CURLOPT_RESOLVE overrides CURLOPT_IPRESOLVE
| -rw-r--r-- | docs/curl.1 | 3 | ||||
| -rw-r--r-- | docs/libcurl/opts/CURLOPT_RESOLVE.3 | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/docs/curl.1 b/docs/curl.1 index 0c183c1de..f2d48f171 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -1585,6 +1585,9 @@ the number used for the specific protocol the host will be used for. It means you need several entries if you want to provide address for the same host but different ports. +The provided address set by this option will be used even if \fI-4, --ipv4\fP +or \fI-6, --ipv6\fP is set to make curl use another IP version. + This option can be used many times to add many host names to resolve. (Added in 7.21.3) diff --git a/docs/libcurl/opts/CURLOPT_RESOLVE.3 b/docs/libcurl/opts/CURLOPT_RESOLVE.3 index 028341ed2..6f31216c9 100644 --- a/docs/libcurl/opts/CURLOPT_RESOLVE.3 +++ b/docs/libcurl/opts/CURLOPT_RESOLVE.3 @@ -48,11 +48,13 @@ HOST+PORT will instead use your provided ADDRESS. Addresses set with \fICURLOPT_RESOLVE(3)\fP will not time-out from the DNS cache like ordinary entries. +The provided ADDRESS set by this option will be used even if +\cICURLOPT_IPRESOLVE(3)\fP is set to make libcurl use another IP version. + Remove names from the DNS cache again, to stop providing these fake resolves, by including a string in the linked list that uses the format \&"-HOST:PORT". The host name must be prefixed with a dash, and the host name -and port number must exactly match what was already added previously. (Added -in 7.42.0) +and port number must exactly match what was already added previously. .SH DEFAULT NULL .SH PROTOCOLS |