From 480926bd702bb8034d2766384fa5ec84cd4b8c12 Mon Sep 17 00:00:00 2001
From: Eduard Bagdasaryan <eduard.bagdasaryan@measurement-factory.com>
Date: Thu, 5 Sep 2019 05:46:59 +0000
Subject: [PATCH] Supply ALE for note ACL (#463)

The following cache.log WARNING is a symptom of this bug:

    ACL is used in context without an ALE state. Assuming mismatch.

Commit cb36505 already covered many (but not all) similar cases.
---
 src/cf.data.pre    | 3 +++
 src/client_side.cc | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 5abbf7e2fb..56bcac5bd5 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -6777,6 +6777,9 @@ DOC_START
 
 	    note key value acl ...
 	    logformat myFormat ... %{key}note ...
+
+	This clause only supports fast acl types.
+	See http://wiki.squid-cache.org/SquidFaq/SquidAcl for details.
 DOC_END
 
 NAME: relaxed_header_parser
diff --git a/src/client_side.cc b/src/client_side.cc
index f47c25d675..f053ede238 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -427,7 +427,7 @@ ClientHttpRequest::logRequest()
     if (request) {
         SBuf matched;
         for (auto h: Config.notes) {
-            if (h->match(request, al->reply, NULL, matched)) {
+            if (h->match(request, al->reply, al, matched)) {
                 request->notes()->add(h->key(), matched);
                 debugs(33, 3, h->key() << " " << matched);
             }
-- 
2.47.3