Fix typos in AccessLogEntry

Some of these were added by rev.12527 patch.

Clash between USE_ICAP_CLIENT and USE_ADAPTATION uncovered while testing
the fix for the those issues. Breaks build for eCAP without ICAP.

diff --git a/src/AccessLogEntry.cc b/src/AccessLogEntry.cc
index 8fdc201072648b8800377292212b478112368b0b..25484c7a54dd84d32b9cd34c11f31ec6cd32b8ca 100644 (file)
--- a/src/AccessLogEntry.cc
+++ b/src/AccessLogEntry.cc
@@ -31,7 +31,7 @@ AccessLogEntry::~AccessLogEntry()
 {
     safe_free(headers.request);
 
-#if ICAP_CLIENT
+#if USE_ADAPTATION
     safe_free(adapt.last_meta);
 #endif
 

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index c84744fe39d931dd972c5ff66e748363d4e3b63e..4c23518e5837fd3d7f58522bc2cc8783db9dab55 100644 (file)
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -243,10 +243,10 @@ public:
     class IcapLogEntry
     {
     public:
-        IcapLogEntry() : reqMethod(methodNone), bytesSent(0), bytesRead(0),
+        IcapLogEntry() : reqMethod(Adaptation::methodNone), bytesSent(0), bytesRead(0),
                 bodyBytesRead(-1), request(NULL), reply(NULL),
                 outcome(Adaptation::Icap::xoUnknown), trTime(0),
-                ioTime(0), processingTime(0), resStatus(HTTP_STATUS_NONE) {}
+                ioTime(0), resStatus(HTTP_STATUS_NONE), processingTime(0) {}
 
         Ip::Address hostAddr; ///< ICAP server IP address
         String serviceName;        ///< ICAP service name