Merge branch 'master' into 1914-refused-blocking-mode

2020-09-09 13:51:53 +03:00
parent 366fdab605 ccb903c9a0
commit 1fadc27615
50 changed files with 1532 additions and 236 deletions
--- a/dnsforward/dnsforward_http.go
+++ b/dnsforward/dnsforward_http.go
@@ -270,7 +270,7 @@ func ValidateUpstreams(upstreams []string) error {
 	return nil
 }

-var protocols = []string{"tls://", "https://", "tcp://", "sdns://"}
+var protocols = []string{"tls://", "https://", "tcp://", "sdns://", "quic://"}

 func validateUpstream(u string) (bool, error) {
 	// Check if user tries to specify upstream for domain