From 0b194f86dcfabe448f7611a8fd5d621309fe25fa Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Fri, 1 May 2015 00:21:07 -0700 Subject: [PATCH] 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. --- src/log/access_log.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/log/access_log.cc b/src/log/access_log.cc index 84d7c06d87..d49909cfe0 100644 --- a/src/log/access_log.cc +++ b/src/log/access_log.cc @@ -114,6 +114,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); @@ -149,9 +153,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; -- 2.47.2