From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 24 Apr 2015 04:15:29 +0000 (-0700)
Subject: Fix 'access_log none' to prevent following logs being used
X-Git-Tag: merge-candidate-3-v1~151
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80b2b3c56c7982dbfede26e8aaef9ec83282b032;p=thirdparty%2Fsquid.git

Fix 'access_log none' to prevent following logs being used

The documented behaviour of "access_log none" for preventing logging
using log lines following the directive has not been working in
Squid-3 for some time.

Since the 'none' type does not have a log module associated the entire
switch logic where its abort is checked for was being skipped.
---

diff --git a/src/log/access_log.cc b/src/log/access_log.cc
index 4b383b9f16..9cdc2506fd 100644
--- a/src/log/access_log.cc
+++ b/src/log/access_log.cc
@@ -96,6 +96,10 @@ accessLogLogTo(CustomLog* log, AccessLogEntry::Pointer &al, ACLChecklist * check
         if (log->aclList && checklist && checklist->fastCheck(log->aclList) != ACCESS_ALLOWED)
             continue;
 
+        // The special-case "none" type has no logfile object set
+        if (log->type == Log::Format::CLF_NONE)
+            return;
+
         if (log->logfile) {
             logfileLineStart(log->logfile);
 
@@ -131,9 +135,6 @@ accessLogLogTo(CustomLog* log, AccessLogEntry::Pointer &al, ACLChecklist * check
                 break;
 #endif
 
-            case Log::Format::CLF_NONE:
-                return; // abort!
-
             default:
                 fatalf("Unknown log format %d\n", log->type);
                 break;