]>
Commit | Line | Data |
---|---|---|
f10a2469 | 1 | ------------------------------------------------------------ |
2 | revno: 13228 | |
3 | revision-id: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg | |
4 | parent: squid3@treenet.co.nz-20150801072237-5tzh2dczozz1e8sq | |
5 | fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3696 | |
6 | committer: Amos Jeffries <squid3@treenet.co.nz> | |
7 | branch nick: 3.4 | |
8 | timestamp: Fri 2015-08-28 06:23:34 -0700 | |
9 | message: | |
10 | Bug 3696: crash when client delay pools are activated | |
11 | ------------------------------------------------------------ | |
12 | # Bazaar merge directive format 2 (Bazaar 0.90) | |
13 | # revision_id: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg | |
14 | # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 | |
15 | # testament_sha1: d193928c4656282187f2a31bf66d43fd4c247177 | |
16 | # timestamp: 2015-08-28 13:33:44 +0000 | |
17 | # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 | |
18 | # base_revision_id: squid3@treenet.co.nz-20150801072237-\ | |
19 | # 5tzh2dczozz1e8sq | |
20 | # | |
21 | # Begin patch | |
22 | === modified file 'src/client_side.cc' | |
23 | --- src/client_side.cc 2014-06-21 04:24:37 +0000 | |
24 | +++ src/client_side.cc 2015-08-28 13:23:34 +0000 | |
25 | @@ -3447,7 +3447,8 @@ | |
26 | ||
27 | /* pools require explicit 'allow' to assign a client into them */ | |
28 | if (pools[pool].access) { | |
29 | - ch.accessList = pools[pool].access; | |
30 | + cbdataReferenceDone(ch.accessList); | |
31 | + ch.accessList = cbdataReference(pools[pool].access); | |
32 | allow_t answer = ch.fastCheck(); | |
33 | if (answer == ACCESS_ALLOWED) { | |
34 | ||
35 |