QUIC: Fix a bug that ssl_multicert.config is not reloaded for QUIC (#…

…11723) * QUIC: Fix a bug that ssl_multicert.config is not reloaded for QUIC * Add ifdef (cherry picked from commit 8e03d9e)
apache · Aug 30, 2024 · 9685265 · 9685265
1 parent be1348f
commit 9685265
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/iocore/net/SSLClientCoordinator.cc b/src/iocore/net/SSLClientCoordinator.cc
@@ -24,6 +24,9 @@
 #include "P_SSLClientCoordinator.h"
 #include "P_SSLConfig.h"
 #include "iocore/net/SSLSNIConfig.h"
+#if TS_USE_QUIC == 1
+#include "iocore/net/QUICMultiCertConfigLoader.h"
+#endif
 
 std::unique_ptr<ConfigUpdateHandler<SSLClientCoordinator>> sslClientUpdate;
 
@@ -36,6 +39,9 @@ SSLClientCoordinator::reconfigure()
   SSLConfig::reconfigure();
   SNIConfig::reconfigure();
   SSLCertificateConfig::reconfigure();
+#if TS_USE_QUIC == 1
+  QUICCertConfig::reconfigure();
+#endif
 }
 
 void

diff --git a/src/iocore/net/SSLUtils.cc b/src/iocore/net/SSLUtils.cc
@@ -1965,7 +1965,7 @@ SSLMultiCertConfigLoader::load(SSLCertLookup *lookup)
 
   const matcher_tags sslCertTags = {nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, false};
 
-  Note("%s loading ...", ts::filename::SSL_MULTICERT);
+  Note("(%s) %s loading ...", this->_debug_tag(), ts::filename::SSL_MULTICERT);
 
   std::error_code ec;
   std::string     content{swoc::file::load(swoc::file::path{params->configFilePath}, ec)};