------------------------------------------------------------ revno: 13120 revision-id: squid3@treenet.co.nz-20140418184335-jh773qjx245u1b8a parent: squid3@treenet.co.nz-20140414140129-tcz1h3w8dn5ix8z7 committer: Amos Jeffries branch nick: 3.4 timestamp: Fri 2014-04-18 12:43:35 -0600 message: Fix IPv6 site-local autoconfigured Address detection ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140418184335-jh773qjx245u1b8a # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # testament_sha1: 7beccf5b8ad9c95354e936bdc882d642e50584f0 # timestamp: 2014-04-18 18:45:35 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 # base_revision_id: squid3@treenet.co.nz-20140414140129-\ # tcz1h3w8dn5ix8z7 # # Begin patch === modified file 'src/ip/Address.cc' --- src/ip/Address.cc 2013-07-26 11:29:14 +0000 +++ src/ip/Address.cc 2014-04-18 18:43:35 +0000 @@ -249,8 +249,8 @@ bool Ip::Address::isSiteLocalAuto() const { - return mSocketAddr_.sin6_addr.s6_addr[10] == static_cast(0xff) && - mSocketAddr_.sin6_addr.s6_addr[11] == static_cast(0xfe); + return mSocketAddr_.sin6_addr.s6_addr[11] == static_cast(0xff) && + mSocketAddr_.sin6_addr.s6_addr[12] == static_cast(0xfe); } bool