From: Eduard Bagdasaryan <eduard.bagdasaryan@measurement-factory.com>
Date: Thu, 5 Sep 2019 05:46:59 +0000 (+0000)
Subject: Supply ALE for note ACL (#463)
X-Git-Tag: SQUID_4_9~13
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5a3de98eeaa3dd054250e8bee75de8d85bc854a1;p=thirdparty%2Fsquid.git

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.
---

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 513a04f140..aaa87125eb 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -6563,6 +6563,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 7c0121a565..975a521d2a 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -425,7 +425,7 @@ ClientHttpRequest::logRequest()
         // The al->notes and request->notes must point to the same object.
         (void)SyncNotes(*al, *request);
         for (auto i = Config.notes.begin(); i != Config.notes.end(); ++i) {
-            if (const char *value = (*i)->match(request, al->reply, NULL)) {
+            if (const char *value = (*i)->match(request, al->reply, al)) {
                 NotePairs &notes = SyncNotes(*al, *request);
                 notes.add((*i)->key.termedBuf(), value);
                 debugs(33, 3, (*i)->key.termedBuf() << " " << value);