Stowage/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-12-08 06:09:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

httpcaddyfile: Decrement counter when removing conn policy (fix #3906)

Browse source
This commit is contained in:
Matthew Holt 2020-12-07 14:22:47 -07:00
parent 6e9ac248dd
commit 7e719157d9
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
2 changed files with 139 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
caddyconfig/httpcaddyfile/tlsapp.go
View file

@ -487,6 +487,7 @@ func consolidateAutomationPolicies(aps []*caddytls.AutomationPolicy) []*caddytls
// remove or combine duplicate policies
for i := 0; i < len(aps); i++ {
// compare only with next policies; we sorted by specificity so we must not delete earlier policies
for j := i + 1; j < len(aps); j++ {
// if they're exactly equal in every way, just keep one of them
if reflect.DeepEqual(aps[i], aps[j]) {
@ -526,6 +527,7 @@ func consolidateAutomationPolicies(aps []*caddytls.AutomationPolicy) []*caddytls
}
}
aps = append(aps[:j], aps[j+1:]...)
j--
}
}
}