GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Re-enable MaxLine

This commit is contained in:
Daniel Oaks 2019-01-12 22:17:51 +10:00
parent 3db6c9472b
commit 63fde2d62a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
irc/config.go
View File

@ -529,8 +529,11 @@ func LoadConfig(filename string) (config *Config, err error) {
} }
config.Server.WebIRC = newWebIRC config.Server.WebIRC = newWebIRC
// process limits // process limits
if config.Limits.LineLen.Tags < 512 || config.Limits.LineLen.Rest < 512 { if config.Limits.LineLen.Tags < 512 {
return nil, ErrLineLengthsTooSmall config.Limits.LineLen.Tags = 512
}
if config.Limits.LineLen.Rest < 512 {
config.Limits.LineLen.Rest = 512
} }
var newLogConfigs []logger.LoggingConfig var newLogConfigs []logger.LoggingConfig
for _, logConfig := range config.Logging { for _, logConfig := range config.Logging {

7
irc/server.go
View File

@ -693,6 +693,13 @@ func (server *Server) applyConfig(config *Config, initial bool) (err error) {
server.accounts.initVHostRequestQueue() server.accounts.initVHostRequestQueue()
} }
// MaxLine
if config.Limits.LineLen.Tags != 512 || config.Limits.LineLen.Rest != 512 {
SupportedCapabilities.Enable(caps.MaxLine)
value := fmt.Sprintf("%d,%d", config.Limits.LineLen.Tags, config.Limits.LineLen.Rest)
CapValues.Set(caps.MaxLine, value)
}
// STS // STS
stsPreviouslyEnabled := oldConfig != nil && oldConfig.Server.STS.Enabled stsPreviouslyEnabled := oldConfig != nil && oldConfig.Server.STS.Enabled
stsValue := config.Server.STS.Value() stsValue := config.Server.STS.Value()