Resolve conflict

This commit is contained in:
ArtemBaskal
2020-07-03 16:58:23 +03:00
114 changed files with 4241 additions and 1444 deletions

View File

@@ -426,6 +426,11 @@ func checkDNS(input string, bootstrap []string) error {
return nil
}
// Control flow:
// web
// -> dnsforward.handleDOH -> dnsforward.ServeHTTP
// -> proxy.ServeHTTP -> proxy.handleDNSRequest
// -> dnsforward.handleDNSRequest
func (s *Server) handleDOH(w http.ResponseWriter, r *http.Request) {
if !s.conf.TLSAllowUnencryptedDOH && r.TLS == nil {
httpError(r, w, http.StatusNotFound, "Not Found")