aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-10-23 23:14:17 +0200
committerDaniel Stenberg <daniel@haxx.se>2013-10-23 23:15:36 +0200
commit947d431d5043b74e6a3b24f2295807055a140cff (patch)
treeea47c34aa5c29c5d9b5b01c9e7afaaf4f062df5e /docs
parent58bd0148fb92921aecbfbee78bd4094b9a9c5ca4 (diff)
CURLOPT_RESOLVE: mention they don't time-out
Clarify in the documentation that DNS entries added with CURLOPT_RESOLVE won't time-out. Bug: http://curl.haxx.se/mail/lib-2013-10/0062.html Reported-by: Romulo Ceccon
Diffstat (limited to 'docs')
-rw-r--r--docs/libcurl/curl_easy_setopt.34
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/libcurl/curl_easy_setopt.3 b/docs/libcurl/curl_easy_setopt.3
index b9d834b93..f58c8fbfe 100644
--- a/docs/libcurl/curl_easy_setopt.3
+++ b/docs/libcurl/curl_easy_setopt.3
@@ -2293,7 +2293,9 @@ ADDRESS can of course be either IPv4 or IPv6 style addressing.
This option effectively pre-populates the DNS cache with entries for the
host+port pair so redirects and everything that operations against the
-HOST+PORT will instead use your provided ADDRESS.
+HOST+PORT will instead use your provided ADDRESS. Addresses to set with
+\fICURL_RESOLVE\fP will not time-out from the DNS cache like ordindary
+entries.
You can 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