------------------------------------------------------------ revno: 11680 revision-id: squid3@treenet.co.nz-20121017001240-e7irl66ug4uiwxlx parent: squid3@treenet.co.nz-20121017001204-16i8f0nigz6jmo0l author: Henrik Nordstrom committer: Amos Jeffries branch nick: 3.2 timestamp: Tue 2012-10-16 18:12:40 -0600 message: Fix ipv6 enabled squidclient. Was failing with assertion failure due to ipv6 support not being probed automatically. ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20121017001240-e7irl66ug4uiwxlx # target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # testament_sha1: 856d989551378ffb40995856023a1de12d07d0cb # timestamp: 2012-10-17 00:13:39 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # base_revision_id: squid3@treenet.co.nz-20121017001204-\ # 16i8f0nigz6jmo0l # # Begin patch === modified file 'tools/squidclient.cc' --- tools/squidclient.cc 2012-07-28 05:38:50 +0000 +++ tools/squidclient.cc 2012-10-17 00:12:40 +0000 @@ -35,6 +35,7 @@ #include "squid.h" #include "base64.h" #include "ip/Address.h" +#include "ip/tools.h" #include "rfc1123.h" #include "SquidTime.h" @@ -246,6 +247,7 @@ pcount = 0; ping_int = 1 * 1000; + Ip::ProbeTransport(); // determine IPv4 or IPv6 capabilities before parsing. if (argc < 2) { usage(argv[0]); /* need URL */ } else if (argc >= 2) {