Deprecate Blackfriday and fix a potential deadlock in config

Note that the deadlock has not been seen earlier, in tests on in real Hugo sites.

Fixes #8792
Fixes #8791

diff --git a/config/defaultConfigProvider.go b/config/defaultConfigProvider.go
index 05c3b9126aafe880889b59a4eedf9030be492b35..2391ec85310dfacfdc72ea9e762b4b3337bbb8c2 100644 (file)
--- a/config/defaultConfigProvider.go
+++ b/config/defaultConfigProvider.go
@@ -89,6 +89,7 @@ func (c *defaultConfigProvider) Get(k string) interface{} {
        c.mu.RLock()
        key, m := c.getNestedKeyAndMap(strings.ToLower(k), false)
        if m == nil {
+               c.mu.RUnlock()
                return nil
        }
        v := m[key]

diff --git a/hugolib/config.go b/hugolib/config.go
index 96114fad139823e07cc71e3c196b4b8ef3a2359f..5f07a4571d83a6ca907ece731e443ba75e44819f 100644 (file)
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -107,12 +107,18 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid
                }
        }
 
+       // Config deprecations.
        // We made this a Glob pattern in Hugo 0.75, we don't need both.
        if l.cfg.GetBool("ignoreVendor") {
                helpers.Deprecated("--ignoreVendor", "--ignoreVendorPaths **", true)
                l.cfg.Set("ignoreVendorPaths", "**")
        }
 
+       if l.cfg.GetString("markup.defaultMarkdownHandler") == "blackfriday" {
+               helpers.Deprecated("markup.defaultMarkdownHandler=blackfriday", "See https://gohugo.io//content-management/formats/#list-of-content-formats", false)
+
+       }
+
        // Some settings are used before we're done collecting all settings,
        // so apply OS environment both before and after.
        if err := l.applyOsEnvOverrides(d.Environ); err != nil {