all: sync with master

internal/home/httpclient.go

@@ -6,7 +6,6 @@ import (
 	"net"
 	"net/http"
 	"net/url"
-	"time"
 )
 
 // httpClient returns a new HTTP client that uses the AdGuard Home's own DNS
@@ -23,7 +22,7 @@ func httpClient() (c *http.Client) {
 
 	return &http.Client{
 		// TODO(a.garipov): Make configurable.
-		Timeout: time.Minute * 5,
+		Timeout: writeTimeout,
 		Transport: &http.Transport{
 			DialContext: dialContext,
 			Proxy:       httpProxy,

internal/home/web.go

@@ -23,6 +23,7 @@ import (
 	"golang.org/x/net/http2/h2c"
 )
 
+// TODO(a.garipov): Make configurable.
 const (
 	// readTimeout is the maximum duration for reading the entire request,
 	// including the body.
@@ -31,7 +32,7 @@ const (
 	readHdrTimeout = 60 * time.Second
 	// writeTimeout is the maximum duration before timing out writes of the
 	// response.
-	writeTimeout = 60 * time.Second
+	writeTimeout = 5 * time.Minute
 )
 
 type webConfig struct {