From 7c5837e79280e6abb3ae143dfc49bca5e74cdd11 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 5 Sep 2018 00:05:46 +0200 Subject: CURLOPT_DNS_USE_GLOBAL_CACHE: deprecated Disable the CURLOPT_DNS_USE_GLOBAL_CACHE option and mark it for deprecation and complete removal in six months. Bug: https://curl.haxx.se/mail/lib-2018-09/0010.html Closes #2942 --- docs/DEPRECATE.md | 21 +++++++++++++++++++++ lib/setopt.c | 2 ++ 2 files changed, 23 insertions(+) diff --git a/docs/DEPRECATE.md b/docs/DEPRECATE.md index eefcf839f..73ae92ffd 100644 --- a/docs/DEPRECATE.md +++ b/docs/DEPRECATE.md @@ -70,3 +70,24 @@ libcurl code. Left to answer: should the *setopt() function start to return error when these options are set to be able to tell when they're trying to use options that are no longer around or should we maintain behavior as much as possible? + +## CURLOPT_DNS_USE_GLOBAL_CACHE + +This option makes libcurl use a global non-thread-safe cache for DNS if +enabled. The option has been marked as "obsolete" in the header file and in +documentation for several years already. + +There's proper and safe method alternative provided since many years: the +share API. + +### State + +In curl 7.62.0 setting this option to TRUE will not have any effect. The +global cache will not be enabled. The code still remains so it is easy to +revert if need be. + +### Removal + +Remove all global-cache related code from curl around April 2019 (might be +7.66.0). + diff --git a/lib/setopt.c b/lib/setopt.c index f2fadc786..66636a2da 100644 --- a/lib/setopt.c +++ b/lib/setopt.c @@ -127,9 +127,11 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, data->set.dns_cache_timeout = arg; break; case CURLOPT_DNS_USE_GLOBAL_CACHE: +#if 0 /* deprecated */ /* remember we want this enabled */ arg = va_arg(param, long); data->set.global_dns_cache = (0 != arg) ? TRUE : FALSE; +#endif break; case CURLOPT_SSL_CIPHER_LIST: /* set a list of cipher we want to use in the SSL connection */ -- cgit v1.2.3