From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 12 Jun 2010 10:25:31 +0000 (+1200)
Subject: Author: Sean Critica <sean.critica@gmail.com>
X-Git-Tag: SQUID_3_1_5~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb85bb59ac96c847d521e001df4f43cca8c498b5;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/access_log.cc b/src/access_log.cc
index c44c12d980..fc4acfa932 100644
--- a/src/access_log.cc
+++ b/src/access_log.cc
@@ -2092,6 +2092,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;
@@ -2100,12 +2107,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