From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 29 May 2017 09:09:54 +0000 (+1200)
Subject: TLS: recognise tls:: namespace on logformat tokens
X-Git-Tag: M-staged-PR71~154
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e2df2b7bb520f598743b6a737b0ab71e1c65c3b;p=thirdparty%2Fsquid.git

TLS: recognise tls:: namespace on logformat tokens

For forward-compatibility with the codes when they switch to TLS naming.
Leaving undocumented until that change actually happens.
---

diff --git a/src/format/Token.cc b/src/format/Token.cc
index 5f8db233be..656e8268af 100644
--- a/src/format/Token.cc
+++ b/src/format/Token.cc
@@ -210,7 +210,7 @@ static TokenTableEntry TokenTableIcap[] = {
 #endif
 
 #if USE_OPENSSL
-// SSL (ssl::) tokens
+// TLS/SSL (tls:: or ssl::) tokens
 static TokenTableEntry TokenTableSsl[] = {
     TokenTableEntry("bump_mode", LFT_SSL_BUMP_MODE),
     TokenTableEntry(">cert_subject", LFT_SSL_USER_CERT_SUBJECT),
@@ -245,6 +245,7 @@ Format::Token::Init()
     TheConfig.registerTokens(SBuf("icap"),::Format::TokenTableIcap);
 #endif
 #if USE_OPENSSL
+    TheConfig.registerTokens(SBuf("tls"),::Format::TokenTableSsl);
     TheConfig.registerTokens(SBuf("ssl"),::Format::TokenTableSsl);
 #endif
 }