------------------------------------------------------------ revno: 12633 revision-id: squid3@treenet.co.nz-20131003111730-gs8mfc7dk7hsq89y parent: squid3@treenet.co.nz-20130929181317-5o5tg7c19twhzeh6 committer: Amos Jeffries branch nick: 3.3 timestamp: Thu 2013-10-03 05:17:30 -0600 message: Use IPv6 localhost nameserver on DNS configuration errors When DNS configuration fails to locate a set of nameservers "localhost" is used as the default but has previously only been setting 127.0.0.1 IPv4 address for localhost. This enables the failover to work as designed on IPv6-only networks. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20131003111730-gs8mfc7dk7hsq89y # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 4cd0b6f3c012369c2ef4f2db8471122c2741d431 # timestamp: 2013-10-03 11:19:10 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20130929181317-\ # 5o5tg7c19twhzeh6 # # Begin patch === modified file 'src/dns_internal.cc' --- src/dns_internal.cc 2013-09-09 07:17:19 +0000 +++ src/dns_internal.cc 2013-10-03 11:17:30 +0000 @@ -1555,6 +1555,8 @@ #endif debugs(78, DBG_IMPORTANT, "or use the 'dns_nameservers' option in squid.conf."); + if (Ip::EnableIpv6) + idnsAddNameserver("::1"); idnsAddNameserver("127.0.0.1"); }