This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 8e03d9ee12 QUIC: Fix a bug that ssl_multicert.config is not reloaded
for QUIC (#11723)
8e03d9ee12 is described below
commit 8e03d9ee1249e556154e435bb1ddb1ea1a5aa0de
Author: Masakazu Kitajo <[email protected]>
AuthorDate: Wed Aug 21 10:54:09 2024 -0600
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
---
src/iocore/net/SSLClientCoordinator.cc | 6 ++++++
src/iocore/net/SSLUtils.cc | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/iocore/net/SSLClientCoordinator.cc
b/src/iocore/net/SSLClientCoordinator.cc
index c634f0c61f..43b2e0c0a8 100644
--- 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
index 141af5aae3..639cbfa4ad 100644
--- a/src/iocore/net/SSLUtils.cc
+++ b/src/iocore/net/SSLUtils.cc
@@ -1938,7 +1938,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)};