diff options
Diffstat (limited to 'client/go/internal/util/http.go')
| -rw-r--r-- | client/go/internal/util/http.go | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/client/go/internal/util/http.go b/client/go/internal/util/http.go index 35e35b16720..26e7937028e 100644 --- a/client/go/internal/util/http.go +++ b/client/go/internal/util/http.go @@ -19,20 +19,17 @@ type HTTPClient interface { } type defaultHTTPClient struct { - client *http.Client - setUserAgent bool + client *http.Client } func (c *defaultHTTPClient) Do(request *http.Request, timeout time.Duration) (response *http.Response, error error) { if c.client.Timeout != timeout { // Set wanted timeout c.client.Timeout = timeout } - if c.setUserAgent { - if request.Header == nil { - request.Header = make(http.Header) - } - request.Header.Set("User-Agent", fmt.Sprintf("Vespa CLI/%s", build.Version)) + if request.Header == nil { + request.Header = make(http.Header) } + request.Header.Set("User-Agent", fmt.Sprintf("Vespa CLI/%s", build.Version)) return c.client.Do(request) } @@ -68,7 +65,6 @@ func ForceHTTP2(client HTTPClient, certificates []tls.Certificate, caCertificate if !ok { return } - c.setUserAgent = false // Let caller control all request headers var dialFunc func(ctx context.Context, network, addr string, cfg *tls.Config) (net.Conn, error) if certificates == nil { // No certificate, so force H2C (HTTP/2 over clear-text) by using a non-TLS Dialer @@ -95,6 +91,5 @@ func CreateClient(timeout time.Duration) HTTPClient { Timeout: timeout, Transport: http.DefaultTransport, }, - setUserAgent: true, } } |