summaryrefslogtreecommitdiffhomepage
path: root/caddy.go
diff options
context:
space:
mode:
authorMatt Holt <[email protected]>2023-07-11 13:10:58 -0600
committerGitHub <[email protected]>2023-07-11 19:10:58 +0000
commit0e2c7e1d35b287fc0e56d6db2951f791e09b5a37 (patch)
tree3669f5d01fa351bda933d3796c50a72da9942a01 /caddy.go
parent7ceef91295343237f5b81ed00e3ba7e8e594d603 (diff)
downloadcaddy-0e2c7e1d35b287fc0e56d6db2951f791e09b5a37.tar.gz
caddy-0e2c7e1d35b287fc0e56d6db2951f791e09b5a37.zip
caddytls: Reuse certificate cache through reloads (#5623)
* caddytls: Don't purge cert cache on config reload * Update CertMagic This actually avoids reloading managed certs from storage when already in the cache, d'oh. * Fix bug; re-implement HasCertificateForSubject * Update go.mod: CertMagic tag
Diffstat (limited to 'caddy.go')
-rw-r--r--caddy.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/caddy.go b/caddy.go
index 84cfc11cf..dcaa86b04 100644
--- a/caddy.go
+++ b/caddy.go
@@ -959,8 +959,9 @@ func Version() (simple, full string) {
// This function is experimental and might be changed
// or removed in the future.
func ActiveContext() Context {
- currentCtxMu.RLock()
- defer currentCtxMu.RUnlock()
+ // TODO: This locking might still be needed; more investigation is required (deadlock during Cleanup for the caddytls.TLS module).
+ // currentCtxMu.RLock()
+ // defer currentCtxMu.RUnlock()
return currentCtx
}