From 3bee569a8ae2d72490cd876c3c218963fe65d224 Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Fri, 10 Apr 2020 08:24:12 -0600 Subject: [PATCH] httpcaddyfile: Don't remove empty TLS conn policies (fix #3249) Not sure why I thought that would be a good idea --- caddyconfig/httpcaddyfile/httptype.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go index 2d8accc2..9ab6c5f6 100644 --- a/caddyconfig/httpcaddyfile/httptype.go +++ b/caddyconfig/httpcaddyfile/httptype.go @@ -569,18 +569,7 @@ func detectConflictingSchemes(srv *caddyhttp.Server, serverBlocks []serverBlock, // consolidateConnPolicies removes empty TLS connection policies and combines // equivalent ones for a cleaner overall output. func consolidateConnPolicies(cps caddytls.ConnectionPolicies) (caddytls.ConnectionPolicies, error) { - empty := new(caddytls.ConnectionPolicy) - 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 for j := 0; j < len(cps); j++ { if j == i {