------------------------------------------------------------ revno: 14093 revision-id: squidadm@squid-cache.org-20161009001414-pksjx5jduk9uf5t8 parent: squid3@treenet.co.nz-20161008203735-4q3zmw5j4w1ueopy committer: Source Maintenance branch nick: 3.5 timestamp: Sun 2016-10-09 00:14:14 +0000 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20161009001414-\ # pksjx5jduk9uf5t8 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: f3814f4520a0465c972544ae3dd595faf8286f43 # timestamp: 2016-10-09 00:51:05 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20161008203735-\ # 4q3zmw5j4w1ueopy # # Begin patch === modified file 'src/ip/Intercept.cc' --- src/ip/Intercept.cc 2016-10-08 20:37:35 +0000 +++ src/ip/Intercept.cc 2016-10-09 00:14:14 +0000 @@ -214,7 +214,8 @@ natLookup.nl_v = 6; newConn->local.getInAddr(natLookup.nl_inipaddr.in6); newConn->remote.getInAddr(natLookup.nl_outipaddr.in6); - } else { + } + else { natLookup.nl_v = 4; newConn->local.getInAddr(natLookup.nl_inipaddr.in4); newConn->remote.getInAddr(natLookup.nl_outipaddr.in4);