github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Update to Go 1.17.4 and remove timeout in resources.Get

Browse source 
Fixes #9265
This commit is contained in:
Bjørn Erik Pedersen 2021-12-09 12:49:17 +01:00
parent 34a96290fa
commit 965a6cbff9
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.circleci/config.yml
View file

@ -1,6 +1,6 @@
defaults: &defaults defaults: &defaults
docker: docker:
- image: bepsays/ci-goreleaser:1.17.2 - image: bepsays/ci-goreleaser:1.17.4
environment: environment:
CGO_ENABLED: "0" CGO_ENABLED: "0"

8
resources/resource_factories/create/create.go
View file

@ -18,7 +18,6 @@ package create
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"context"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
@ -182,13 +181,6 @@ func (c *Client) FromRemote(uri string, options map[string]interface{}) (resourc
addUserProvidedHeaders(headers, req) addUserProvidedHeaders(headers, req)
} }
// Workaround for https://github.com/golang/go/issues/49366
// This is the entire lifetime of the request.
ctx, cancel := context.WithTimeout(req.Context(), 30*time.Second)
defer cancel()
req = req.WithContext(ctx)
res, err := c.httpClient.Do(req) res, err := c.httpClient.Do(req)
if err != nil { if err != nil {
return nil, err return nil, err