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

   1 ------------------------------------------------------------
   2 revno: 14171
   3 revision-id: squidadm@squid-cache.org-20170615001633-wgrl5w8isv15o7gg
   4 parent: squid3@treenet.co.nz-20170614215906-ly36sobvlr2pt0u6
   5 committer: Source Maintenance <squidadm@squid-cache.org>
   6 branch nick: 3.5
   7 timestamp: Thu 2017-06-15 00:16:33 +0000
   8 message:
   9   SourceFormat Enforcement
  10 ------------------------------------------------------------
  11 # Bazaar merge directive format 2 (Bazaar 0.90)
  12 # revision_id: squidadm@squid-cache.org-20170615001633-\
  13 #   wgrl5w8isv15o7gg
  14 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  15 # testament_sha1: 237182ac5eed6aca7e9aca295a90057f3a8cf10b
  16 # timestamp: 2017-06-15 00:51:05 +0000
  17 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  18 # base_revision_id: squid3@treenet.co.nz-20170614215906-\
  19 #   ly36sobvlr2pt0u6
  20 #
  21 # Begin patch
  22 === modified file 'src/http.cc'
  23 --- src/http.cc 2017-06-14 21:37:20 +0000
  24 +++ src/http.cc 2017-06-15 00:16:33 +0000
  25 @@ -523,7 +523,7 @@
  26      case Http::scMisdirectedRequest:
  27          statusAnswer = ReuseDecision::doNotCacheButShare;
  28          statusReason = shareableError;
  29 -        // fall through to the actual decision making below
  30 +    // fall through to the actual decision making below
  31
  32      case Http::scBadRequest: // no sharing; perhaps the server did not like something specific to this request
  33
  34 @@ -2438,8 +2438,8 @@
  35      };
  36
  37      assert(d.answer >= HttpStateData::ReuseDecision::reuseNot &&
  38 -            d.answer <= HttpStateData::ReuseDecision::doNotCacheButShare);
  39 +           d.answer <= HttpStateData::ReuseDecision::doNotCacheButShare);
  40      return os << ReuseMessages[d.answer] << " because " << d.reason <<
  41 -        "; HTTP status " << d.statusCode << " " << *(d.entry);
  42 +           "; HTTP status " << d.statusCode << " " << *(d.entry);
  43  }
  44
  45