]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/squid/squid-3.5-14052.patch
kernel: update to 3.14.79.
[ipfire-2.x.git] / src / patches / squid / squid-3.5-14052.patch
1 ------------------------------------------------------------
2 revno: 14052
3 revision-id: squidadm@squid-cache.org-20160517181416-sfrjdosd9dhx7u8o
4 parent: squid3@treenet.co.nz-20160517145850-uos9z00nrt7xd9ik
5 committer: Source Maintenance <squidadm@squid-cache.org>
6 branch nick: 3.5
7 timestamp: Tue 2016-05-17 18:14:16 +0000
8 message:
9 SourceFormat Enforcement
10 ------------------------------------------------------------
11 # Bazaar merge directive format 2 (Bazaar 0.90)
12 # revision_id: squidadm@squid-cache.org-20160517181416-\
13 # sfrjdosd9dhx7u8o
14 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
15 # testament_sha1: e30c12805cacdb559925da08cc6a25fe4a39c19b
16 # timestamp: 2016-05-17 18:51:06 +0000
17 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
18 # base_revision_id: squid3@treenet.co.nz-20160517145850-\
19 # uos9z00nrt7xd9ik
20 #
21 # Begin patch
22 === modified file 'src/external_acl.cc'
23 --- src/external_acl.cc 2016-05-17 14:58:50 +0000
24 +++ src/external_acl.cc 2016-05-17 18:14:16 +0000
25 @@ -956,7 +956,7 @@
26 request->clientConnectionManager->clientConnection->remoteEui64.encode(buf, sizeof(buf));
27 str = buf;
28 }
29 - break;
30 + break;
31
32 case Format::LFT_EXT_ACL_CLIENT_EUI48:
33 if (request->clientConnectionManager.valid() && request->clientConnectionManager->clientConnection != NULL &&
34