Merge branch 'master' into AG-23599-use-hostsfile-vol.2

AdguardTeam · Oct 11, 2023 · 0e6e9ad · 0e6e9ad
2 parents b10f900 + b4abccf
commit 0e6e9ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/upstream/doh.go b/upstream/doh.go
@@ -185,11 +185,11 @@ func (p *dnsOverHTTPS) Close() (err error) {
 
 	runtime.SetFinalizer(p, nil)
 
-	if p.client == nil {
-		return nil
+	if p.client != nil {
+		err = p.closeClient(p.client)
 	}
 
-	return p.closeClient(p.client)
+	return err
 }
 
 // closeClient cleans up resources used by client if necessary.  Note, that at

diff --git a/upstream/dot.go b/upstream/dot.go
@@ -141,11 +141,7 @@ func (p *dnsOverTLS) Close() (err error) {
 		}
 	}
 
-	if len(closeErrs) > 0 {
-		return errors.List("closing tls conns", closeErrs...)
-	}
-
-	return nil
+	return errors.Join(closeErrs...)
 }
 
 // conn returns the first available connection from the pool if there is any, or