From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sat, 15 Oct 2016 02:31:11 +0000 (-0600)
Subject: Fixed r14838 build with eCAP but whithout ICAP support.
X-Git-Tag: SQUID_4_0_16~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c529dfc7a694f12edaf1527702617c676719ebf3;p=thirdparty%2Fsquid.git

Fixed r14838 build with eCAP but whithout ICAP support.

That is, when ./configured with --enable-ecap --disable-icap-client.

AccessLogEntry::icap requires ICAP_CLIENT, not just USE_ADAPTATION.
---

diff --git a/src/format/Format.cc b/src/format/Format.cc
index bce95311d8..afcc81a3ea 100644
--- a/src/format/Format.cc
+++ b/src/format/Format.cc
@@ -339,7 +339,7 @@ static const HttpMsg *
 actualReplyHeader(const AccessLogEntry::Pointer &al)
 {
     const HttpMsg *msg = al->reply;
-#if USE_ADAPTATION
+#if ICAP_CLIENT
     // al->icap.reqMethod is methodNone in access.log context
     if (!msg && al->icap.reqMethod == Adaptation::methodReqmod)
         msg = al->adapted_request;
@@ -352,7 +352,7 @@ actualReplyHeader(const AccessLogEntry::Pointer &al)
 static const HttpMsg *
 actualRequestHeader(const AccessLogEntry::Pointer &al)
 {
-#if USE_ADAPTATION
+#if ICAP_CLIENT
     // al->icap.reqMethod is methodNone in access.log context
     if (al->icap.reqMethod == Adaptation::methodRespmod) {
         // XXX: for now AccessLogEntry lacks virgin response headers
@@ -868,7 +868,7 @@ Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logS
         break;
 
         case LFT_REQUEST_ALL_HEADERS:
-#if USE_ADAPTATION
+#if ICAP_CLIENT
             if (al->icap.reqMethod == Adaptation::methodRespmod) {
                 // XXX: since AccessLogEntry::Headers lacks virgin response
                 // headers, do nothing for now
@@ -892,7 +892,7 @@ Format::Format::assemble(MemBuf &mb, const AccessLogEntry::Pointer &al, int logS
 
         case LFT_REPLY_ALL_HEADERS:
             out = al->headers.reply;
-#if USE_ADAPTATION
+#if ICAP_CLIENT
             if (!out && al->icap.reqMethod == Adaptation::methodReqmod)
                 out = al->headers.adapted_request;
 #endif