github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

Deprecate Blackfriday and fix a potential deadlock in config

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

Fixes #8792
Fixes #8791
This commit is contained in:
Bjørn Erik Pedersen 2021-07-26 11:21:11 +02:00
parent e09d7882c8
commit c7252224c4
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/defaultConfigProvider.go
View file

@ -89,6 +89,7 @@ func (c *defaultConfigProvider) Get(k string) interface{} {
c.mu.RLock() c.mu.RLock()
key, m := c.getNestedKeyAndMap(strings.ToLower(k), false) key, m := c.getNestedKeyAndMap(strings.ToLower(k), false)
if m == nil { if m == nil {
c.mu.RUnlock()
return nil return nil
} }
v := m[key] v := m[key]

6
hugolib/config.go
View file

@ -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. // We made this a Glob pattern in Hugo 0.75, we don't need both.
if l.cfg.GetBool("ignoreVendor") { if l.cfg.GetBool("ignoreVendor") {
helpers.Deprecated("--ignoreVendor", "--ignoreVendorPaths **", true) helpers.Deprecated("--ignoreVendor", "--ignoreVendorPaths **", true)
l.cfg.Set("ignoreVendorPaths", "**") 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, // Some settings are used before we're done collecting all settings,
// so apply OS environment both before and after. // so apply OS environment both before and after.
if err := l.applyOsEnvOverrides(d.Environ); err != nil { if err := l.applyOsEnvOverrides(d.Environ); err != nil {