src/patches/squid/squid-3.5-14129.patch

   1 ------------------------------------------------------------
   2 revno: 14129
   3 revision-id: squid3@treenet.co.nz-20161226022200-u1dnvhu0rdby78u2
   4 parent: squid3@treenet.co.nz-20161216043137-lsk9s4fq21sqsdfo
   5 fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3940
   6 committer: Amos Jeffries <squid3@treenet.co.nz>
   7 branch nick: 3.5
   8 timestamp: Mon 2016-12-26 15:22:00 +1300
   9 message:
  10   Bug 3940 pt2: Make 'cache deny' do what is documented
  11
  12   Instead of overriding whatever cacheability was previously set to
  13   (including changing non-cacheables to be cacheable) actually
  14   prevent both cache read and write.
  15 ------------------------------------------------------------
  16 # Bazaar merge directive format 2 (Bazaar 0.90)
  17 # revision_id: squid3@treenet.co.nz-20161226022200-u1dnvhu0rdby78u2
  18 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  19 # testament_sha1: 579020c4bb34961317f8fd0498393aba4a797b14
  20 # timestamp: 2016-12-26 02:23:14 +0000
  21 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  22 # base_revision_id: squid3@treenet.co.nz-20161216043137-\
  23 #   lsk9s4fq21sqsdfo
  24 #
  25 # Begin patch
  26 === modified file 'src/client_side_request.cc'
  27 --- src/client_side_request.cc  2016-09-23 15:28:42 +0000
  28 +++ src/client_side_request.cc  2016-12-26 02:22:00 +0000
  29 @@ -1407,7 +1407,10 @@
  30  ClientRequestContext::checkNoCacheDone(const allow_t &answer)
  31  {
  32      acl_checklist = NULL;
  33 -    http->request->flags.cachable = (answer == ACCESS_ALLOWED);
  34 +    if (answer == ACCESS_DENIED) {
  35 +        http->request->flags.noCache = true; // dont read reply from cache
  36 +        http->request->flags.cachable = false; // dont store reply into cache
  37 +    }
  38      http->doCallouts();
  39  }
  40
  41