From 66bcf2468db7d3936d9f91fe73b88966b91e50fb Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Wed, 7 Jul 2021 12:28:45 +0200 Subject: [PATCH] Simplify request creation when getting capabilities. --- backend_client.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/backend_client.go b/backend_client.go index 5b13c2f..b1e1e9d 100644 --- a/backend_client.go +++ b/backend_client.go @@ -210,20 +210,16 @@ func (b *BackendClient) getCapabilities(ctx context.Context, u *url.URL) (map[st } defer pool.Put(c) - req := &http.Request{ - Method: "GET", - URL: &capUrl, - Proto: "HTTP/1.1", - ProtoMajor: 1, - ProtoMinor: 1, - Header: make(http.Header), - Host: u.Host, + req, err := http.NewRequestWithContext(ctx, "GET", capUrl.String(), nil) + if err != nil { + log.Printf("Could not create request to %s: %s", &capUrl, err) + return nil, err } req.Header.Set("Accept", "application/json") req.Header.Set("OCS-APIRequest", "true") req.Header.Set("User-Agent", "nextcloud-spreed-signaling/"+b.version) - resp, err := c.Do(req.WithContext(ctx)) + resp, err := c.Do(req) if err != nil { return nil, err }