Merge branch 'master' into issue/763

ooni · Jul 12, 2020 · 7265588 · 7265588
2 parents c2acb5b + 1e211d5
commit 7265588
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/netx/resolver/dnsoverhttps.go b/netx/resolver/dnsoverhttps.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"io/ioutil"
 	"net/http"
+	"time"
 
 	"github.com/ooni/probe-engine/internal/httpheader"
 )
@@ -25,6 +26,8 @@ func NewDNSOverHTTPS(client *http.Client, URL string) DNSOverHTTPS {
 
 // RoundTrip implements RoundTripper.RoundTrip.
 func (t DNSOverHTTPS) RoundTrip(ctx context.Context, query []byte) ([]byte, error) {
+	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
+	defer cancel()
 	req, err := http.NewRequest("POST", t.URL, bytes.NewReader(query))
 	if err != nil {
 		return nil, err