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 a550a7ed8327ac6fc3a894cbc7ee20536f2d8741..e0c69d3499e9deff01a80f86f8ae135c5a9cdadb 100644 (file)
--- 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
 }