serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 14:13:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

httpcaddyfile: Don't remove empty TLS conn policies (fix #3249)

Browse source 
Not sure why I thought that would be a good idea
This commit is contained in:
Matthew Holt 2020-04-10 08:24:12 -06:00
parent 999ab22b8c
commit 3bee569a8a
No known key found for this signature in database
GPG key ID: 2A349DD577D586A5
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
caddyconfig/httpcaddyfile/httptype.go
View file

@ -569,18 +569,7 @@ func detectConflictingSchemes(srv *caddyhttp.Server, serverBlocks []serverBlock,
// consolidateConnPolicies removes empty TLS connection policies and combines // consolidateConnPolicies removes empty TLS connection policies and combines
// equivalent ones for a cleaner overall output. // equivalent ones for a cleaner overall output.
func consolidateConnPolicies(cps caddytls.ConnectionPolicies) (caddytls.ConnectionPolicies, error) { func consolidateConnPolicies(cps caddytls.ConnectionPolicies) (caddytls.ConnectionPolicies, error) {
empty := new(caddytls.ConnectionPolicy)
for i := 0; i < len(cps); i++ { for i := 0; i < len(cps); i++ {
// if the connection policy is empty or has
// only matchers, we can remove it entirely
empty.MatchersRaw = cps[i].MatchersRaw
if reflect.DeepEqual(empty, cps[i]) {
cps = append(cps[:i], cps[i+1:]...)
i--
continue
}
// compare it to the others // compare it to the others
for j := 0; j < len(cps); j++ { for j := 0; j < len(cps); j++ {
if j == i { if j == i {