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

   1 ------------------------------------------------------------
   2 revno: 14099
   3 revision-id: squid3@treenet.co.nz-20161015042024-jagzafukd2t6gcr0
   4 parent: squid3@treenet.co.nz-20161009195739-pcju9hl8vqwijt26
   5 author: Alex Rousskov <rousskov@measurement-factory.com>
   6 committer: Amos Jeffries <squid3@treenet.co.nz>
   7 branch nick: 3.5
   8 timestamp: Sat 2016-10-15 17:20:24 +1300
   9 message:
  10   Fix build with eCAP but without ICAP support.
  11
  12   That is, when ./configured with --enable-ecap --disable-icap-client.
  13
  14   AccessLogEntry::icap requires ICAP_CLIENT, not just USE_ADAPTATION.
  15 ------------------------------------------------------------
  16 # Bazaar merge directive format 2 (Bazaar 0.90)
  17 # revision_id: squid3@treenet.co.nz-20161015042024-jagzafukd2t6gcr0
  18 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  19 # testament_sha1: 4cd2e7bf4e2be0acd252963afc107537b17450fc
  20 # timestamp: 2016-10-15 04:52:07 +0000
  21 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  22 # base_revision_id: squid3@treenet.co.nz-20161009195739-\
  23 #   pcju9hl8vqwijt26
  24 #
  25 # Begin patch
  26 === modified file 'src/format/Format.cc'
  27 --- src/format/Format.cc        2016-09-16 11:53:28 +0000
  28 +++ src/format/Format.cc        2016-10-15 04:20:24 +0000
  29 @@ -318,7 +318,7 @@
  30  actualReplyHeader(const AccessLogEntry::Pointer &al)
  31  {
  32      const HttpMsg *msg = al->reply;
  33 -#if USE_ADAPTATION
  34 +#if ICAP_CLIENT
  35      // al->icap.reqMethod is methodNone in access.log context
  36      if (!msg && al->icap.reqMethod == Adaptation::methodReqmod)
  37          msg = al->adapted_request;
  38 @@ -331,7 +331,7 @@
  39  static const HttpMsg *
  40  actualRequestHeader(const AccessLogEntry::Pointer &al)
  41  {
  42 -#if USE_ADAPTATION
  43 +#if ICAP_CLIENT
  44      // al->icap.reqMethod is methodNone in access.log context
  45      if (al->icap.reqMethod == Adaptation::methodRespmod) {
  46          // XXX: for now AccessLogEntry lacks virgin response headers
  47 @@ -819,7 +819,7 @@
  48          break;
  49
  50          case LFT_REQUEST_ALL_HEADERS:
  51 -#if USE_ADAPTATION
  52 +#if ICAP_CLIENT
  53              if (al->icap.reqMethod == Adaptation::methodRespmod) {
  54                  // XXX: since AccessLogEntry::Headers lacks virgin response
  55                  // headers, do nothing for now
  56 @@ -843,7 +843,7 @@
  57
  58          case LFT_REPLY_ALL_HEADERS:
  59              out = al->headers.reply;
  60 -#if USE_ADAPTATION
  61 +#if ICAP_CLIENT
  62              if (!out && al->icap.reqMethod == Adaptation::methodReqmod)
  63                  out = al->headers.adapted_request;
  64  #endif
  65