3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-14 07:59:31 +01:00

don't call (*Config).prepareListeners twice

This commit is contained in:
Shivaram Lingamneni 2021-04-18 21:38:56 -04:00
parent 1a5d079670
commit 517b776b62

View File

@ -1497,11 +1497,6 @@ func LoadConfig(filename string) (config *Config, err error) {
return nil, err return nil, err
} }
err = config.prepareListeners()
if err != nil {
return nil, fmt.Errorf("failed to prepare listeners: %v", err)
}
// #1428: Tor listeners should never see STS // #1428: Tor listeners should never see STS
config.Server.supportedCapsWithoutSTS = caps.NewSet() config.Server.supportedCapsWithoutSTS = caps.NewSet()
config.Server.supportedCapsWithoutSTS.Union(config.Server.supportedCaps) config.Server.supportedCapsWithoutSTS.Union(config.Server.supportedCaps)