------------------------------------------------------------
revno: 13642
revision-id: squid3@treenet.co.nz-20141016185522-6cj0uxdoue28aew1
parent: squid3@treenet.co.nz-20141016185343-ivr90yk2c8utxzbp
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4024
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.5
timestamp: Thu 2014-10-16 11:55:22 -0700
message:
  Bug 4024: Bad host/IP ::1 when using IPv4-only environment
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20141016185522-6cj0uxdoue28aew1
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 609d3acb4cb6dc1fcefe7a44301a76155f12697e
# timestamp: 2014-10-16 19:50:44 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20141016185343-\
#   ivr90yk2c8utxzbp
# 
# Begin patch
=== modified file 'src/acl/Ip.cc'
--- src/acl/Ip.cc	2014-09-13 13:59:43 +0000
+++ src/acl/Ip.cc	2014-10-16 18:55:22 +0000
@@ -384,10 +384,15 @@
 
         int errcode = getaddrinfo(addr1,NULL,&hints,&hp);
         if (hp == NULL) {
-            debugs(28, DBG_CRITICAL, "aclIpParseIpData: Bad host/IP: '" << addr1 <<
-                   "' in '" << t << "', flags=" << hints.ai_flags <<
-                   " : (" << errcode << ") " << gai_strerror(errcode) );
-            self_destruct();
+            if (strcmp(addr1, "::1") == 0) {
+                debugs(28, DBG_IMPORTANT, "aclIpParseIpData: IPv6 has not been enabled in host DNS resolver.");
+                delete q;
+            } else {
+                debugs(28, DBG_CRITICAL, "aclIpParseIpData: Bad host/IP: '" << addr1 <<
+                       "' in '" << t << "', flags=" << hints.ai_flags <<
+                       " : (" << errcode << ") " << gai_strerror(errcode) );
+                self_destruct();
+            }
             return NULL;
         }