Commit ab5a6893 authored May 17, 2016 by Daniel Stenberg

docs: CURLOPT_RESOLVE overrides CURLOPT_IPRESOLVE

parent 9f475f7b

docs/curl.1

+3 −0

Original line number	Diff line number	Diff line
		@@ -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)

docs/libcurl/opts/CURLOPT_RESOLVE.3

+4 −2

Original line number	Diff line number	Diff line
		@@ -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