------------------------------------------------------------ revno: 12355 revision-id: squid3@treenet.co.nz-20121010015109-fgkkp6rcw7ivlhi5 parent: squid3@treenet.co.nz-20121010015028-gz726tau17znj1ar author: Henrik Nordstrom committer: Amos Jeffries branch nick: 3.3 timestamp: Tue 2012-10-09 19:51:09 -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-20121010015109-fgkkp6rcw7ivlhi5 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 1754fdfe974769c20e65418940aace43d83e991e # timestamp: 2012-10-10 01:52:42 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20121010015028-\ # gz726tau17znj1ar # # Begin patch === modified file 'tools/squidclient.cc' --- tools/squidclient.cc 2012-09-01 14:38:36 +0000 +++ tools/squidclient.cc 2012-10-10 01:51:09 +0000 @@ -33,6 +33,7 @@ #include "squid.h" #include "base64.h" #include "ip/Address.h" +#include "ip/tools.h" #include "rfc1123.h" #include "SquidTime.h" @@ -243,6 +244,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) {