]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
TLS: recognise tls:: namespace on logformat tokens
authorAmos Jeffries <squid3@treenet.co.nz>
Mon, 29 May 2017 09:09:54 +0000 (21:09 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Mon, 29 May 2017 09:09:54 +0000 (21:09 +1200)
For forward-compatibility with the codes when they switch to TLS naming.
Leaving undocumented until that change actually happens.

src/format/Token.cc

index 5f8db233beacb81b44d1d4a41fc963062a29d75f..656e8268af834b369a1c8a51af6f5fd96c052709 100644 (file)
@@ -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
 }