Removes the dns_testnames squid.conf option and all related code.
Obsoletes -D command line option which existed only for the purpose of
turning dns_testnames off. A scheduled for absolute removal in Squid
3.2. But should be assumed as non-existing from 3.1 onwards.
Amos
--
Please use Squid 2.7.STABLE3 or 3.0.STABLE7
=== modified file 'src/cf.data.pre'
--- src/cf.data.pre 2008-07-17 15:17:06 +0000
+++ src/cf.data.pre 2008-07-18 01:07:07 +0000
@@ -5438,17 +5438,6 @@
definitions.
DOC_END
-NAME: dns_testnames
-TYPE: wordlist
-LOC: Config.dns_testname_list
-DEFAULT: none
-DEFAULT_IF_NONE: netscape.com internic.net nlanr.net microsoft.com
-DOC_START
- The DNS tests exit as soon as the first site is successfully looked up
-
- This test can be disabled with the -D command line option.
-DOC_END
-
NAME: append_domain
TYPE: string
LOC: Config.appendDomain
=== modified file 'src/globals.h'
--- src/globals.h 2008-07-02 03:49:07 +0000
+++ src/globals.h 2008-07-18 01:14:08 +0000
@@ -95,7 +95,6 @@
extern int neighbors_do_private_keys; /* 1 */
extern int opt_catch_signals; /* 1 */
extern int opt_debug_stderr; /* -1 */
- extern int opt_dns_tests; /* 1 */
extern int opt_foreground_rebuild; /* 0 */
extern char *opt_forwarded_for; /* NULL */
extern int opt_reload_hit_only; /* 0 */
=== modified file 'src/ipcache.cc'
--- src/ipcache.cc 2008-07-12 15:40:56 +0000
+++ src/ipcache.cc 2008-07-18 01:16:17 +0000
@@ -142,7 +142,6 @@
#endif
static IPH ipcacheHandleCnameRecurse;
static int ipcacheExpiredEntry(ipcache_entry *);
-static int ipcache_testname(void);
#if USE_DNSSERVERS
static int ipcacheParse(ipcache_entry *, const char *buf);
#else
@@ -168,24 +167,6 @@
extern int _dns_ttl_;
#endif
-/// \ingroup IPCacheInternal
-static int
-ipcache_testname(void)
-{
- wordlist *w = NULL;
- debugs(14, 1, "Performing DNS Tests...");
-
- if ((w = Config.dns_testname_list) == NULL)
- return 1;
-
- for (; w; w = w->next) {
- if (gethostbyname(w->key) != NULL)
- return 1;
- }
-
- return 0;
-}
-
/**
\ingroup IPCacheInternal
*
@@ -792,19 +773,9 @@
ipcache_init(void)
{
int n;
- debugs(14, 3, "Initializing IP Cache...");
+ debugs(14, DBG_IMPORTANT, "Initializing IP Cache...");
memset(&IpcacheStats, '\0', sizeof(IpcacheStats));
memset(&lru_list, '\0', sizeof(lru_list));
- /* test naming lookup */
-
- if (!opt_dns_tests) {
- debugs(14, 4, "ipcache_init: Skipping DNS name lookup tests.");
- } else if (!ipcache_testname()) {
- fatal("ipcache_init: DNS name lookup tests failed.");
- } else {
- debugs(14, 1, "Successful DNS name lookup tests...");
- }
-
memset(&static_addrs, '\0', sizeof(ipcache_addrs));
static_addrs.in_addrs = (IPAddress *)xcalloc(1, sizeof(IPAddress));
=== modified file 'src/main.cc'
--- src/main.cc 2008-07-14 13:35:09 +0000
+++ src/main.cc 2008-07-18 01:35:07 +0000
@@ -207,9 +207,9 @@
{
fprintf(stderr,
#if USE_WIN32_SERVICE
- "Usage: %s [-cdhirvzCDFNRVYX] [-s | -l facility] [-f config-file] [-[au] port] [-k signal] [-n name] [-O CommandLine]\n"
+ "Usage: %s [-cdhirvzCFNRVYX] [-s | -l facility] [-f config-file] [-[au] port] [-k signal] [-n name] [-O CommandLine]\n"
#else
- "Usage: %s [-cdhvzCDFNRVYX] [-s | -l facility] [-f config-file] [-[au] port] [-k signal]\n"
+ "Usage: %s [-cdhvzCFNRVYX] [-s | -l facility] [-f config-file] [-[au] port] [-k signal]\n"
#endif
" -a port Specify HTTP port number (default: %d).\n"
" -d level Write debugging to stderr also.\n"
@@ -233,7 +233,7 @@
" -v Print version.\n"
" -z Create swap directories\n"
" -C Do not catch fatal signals.\n"
- " -D Disable initial DNS tests.\n"
+ " -D OBSOLETE. Scheduled for removal.\n"
" -F Don't serve any requests until store is rebuilt.\n"
" -N No daemon mode.\n"
#if USE_WIN32_SERVICE
@@ -279,8 +279,8 @@
case 'D':
/** \par D
- * Unset/disable global option for optional DNS tests. opt_dns_tests */
- opt_dns_tests = 0;
+ * OBSOLETE: WAS: override to prevent optional startup DNS tests. */
+ debugs(1,DBG_CRITICAL, "WARNING: -D command-line option is obsolete.");
break;
case 'F':
=== modified file 'src/structs.h'
--- src/structs.h 2008-07-17 12:38:06 +0000
+++ src/structs.h 2008-07-18 01:07:28 +0000
@@ -371,7 +371,6 @@
size_t udpMaxHitObjsz;
wordlist *hierarchy_stoplist;
wordlist *mcast_group_list;
- wordlist *dns_testname_list;
wordlist *dns_nameservers;
peer *peers;
int npeers;
