From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 7 Jun 2010 06:01:30 +0000 (+1200)
Subject: Author: Sean Critica <sean.critica@gmail.com>
X-Git-Tag: SQUID_3_2_0_1~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=190d8192d9f5d840b47041c3c22eb0ebad7009a0;p=thirdparty%2Fsquid.git

Author: Sean Critica <sean.critica@gmail.com>
Bug 2943: ICAP tokens not logged when using multiple access
---

diff --git a/src/log/access_log.cc b/src/log/access_log.cc
index b8a4b3e691..db921999c0 100644
--- a/src/log/access_log.cc
+++ b/src/log/access_log.cc
@@ -2137,6 +2137,13 @@ accessLogInit(void)
 
     assert(sizeof(log_tags) == (LOG_TYPE_MAX + 1) * sizeof(char *));
 
+#if USE_ADAPTATION
+	alLogformatHasAdaptToken = false;
+#endif
+#if ICAP_CLIENT
+	alLogformatHasIcapToken = false;
+#endif
+
     for (log = Config.Log.accesslogs; log; log = log->next) {
         if (log->type == CLF_NONE)
             continue;
@@ -2145,12 +2152,6 @@ accessLogInit(void)
 
         LogfileStatus = LOG_ENABLE;
 
-#if USE_ADAPTATION
-        alLogformatHasAdaptToken = false;
-#endif
-#if ICAP_CLIENT
-        alLogformatHasIcapToken = false;
-#endif
 #if USE_ADAPTATION || ICAP_CLIENT
         for (logformat_token * curr_token = (log->logFormat?log->logFormat->format:NULL); curr_token; curr_token = curr_token->next) {
 #if USE_ADAPTATION