From: Amos Jeffries <squid3@treenet.co.nz>
Date: Wed, 14 Jun 2017 19:19:21 +0000 (+1200)
Subject: TLS: recognise tls:: namespace on logformat tokens
X-Git-Tag: SQUID_4_0_21~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b032b0687573f7e1a674ed2f169020448c982989;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 a550a7ed83..e0c69d3499 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(String("icap"),::Format::TokenTableIcap);
 #endif
 #if USE_OPENSSL
+    TheConfig.registerTokens(String("tls"),::Format::TokenTableSsl);
     TheConfig.registerTokens(String("ssl"),::Format::TokenTableSsl);
 #endif
 }