Merge remote-tracking branch 'upstream/v2.2' into mrg-current-v2.2

pkg/types/domains.go

@@ -30,7 +30,7 @@ func (d *Domain) Set(domains []string) {
 }
 
 // MatchDomain returns true if a domain match the cert domain.
-func MatchDomain(domain string, certDomain string) bool {
+func MatchDomain(domain, certDomain string) bool {
 	if domain == certDomain {
 		return true
 	}

pkg/types/logs.go

@@ -113,7 +113,7 @@ func checkFieldValue(value string, defaultKeep bool) bool {
 	}
 }
 
-func checkFieldHeaderValue(value string, defaultValue string) string {
+func checkFieldHeaderValue(value, defaultValue string) string {
 	if value == AccessLogKeep || value == AccessLogDrop || value == AccessLogRedact {
 		return value
 	}