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

   1 ------------------------------------------------------------
   2 revno: 14125
   3 revision-id: squid3@treenet.co.nz-20161215093634-ykbs6tv8pdusz7cj
   4 parent: squid3@treenet.co.nz-20161215092210-8gupdsihb4d8fufk
   5 fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3940
   6 author: Garri Djavadyan <garryd@comnet.uz>
   7 committer: Amos Jeffries <squid3@treenet.co.nz>
   8 branch nick: 3.5
   9 timestamp: Thu 2016-12-15 22:36:34 +1300
  10 message:
  11   Bug 3940 (partial): hostHeaderVerify failures MISS when they should be HIT
  12
  13   This fixes the critical condition leading to the HIT. However not all
  14   code is correctly setting flags.noCache and flags.cacheable (see bugzilla).
  15   So there may be other fixes needed after this.
  16 ------------------------------------------------------------
  17 # Bazaar merge directive format 2 (Bazaar 0.90)
  18 # revision_id: squid3@treenet.co.nz-20161215093634-ykbs6tv8pdusz7cj
  19 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  20 # testament_sha1: 3e1ebda070635dcabfa4f77d697ac12e8683106f
  21 # timestamp: 2016-12-15 09:39:01 +0000
  22 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  23 # base_revision_id: squid3@treenet.co.nz-20161215092210-\
  24 #   8gupdsihb4d8fufk
  25 #
  26 # Begin patch
  27 === modified file 'src/client_side_reply.cc'
  28 --- src/client_side_reply.cc    2016-11-11 06:03:25 +0000
  29 +++ src/client_side_reply.cc    2016-12-15 09:36:34 +0000
  30 @@ -1649,7 +1649,9 @@
  31  {
  32      HttpRequest *r = http->request;
  33
  34 -    if (r->flags.cachable || r->flags.internal) {
  35 +    // client sent CC:no-cache or some other condition has been
  36 +    // encountered which prevents delivering a public/cached object.
  37 +    if (!r->flags.noCache || r->flags.internal) {
  38          lookingforstore = 5;
  39          StoreEntry::getPublicByRequest (this, r);
  40      } else {
  41