diff options
author | Jaime Martinez <jmartinez@gitlab.com> | 2021-08-10 06:23:16 +0300 |
---|---|---|
committer | Jaime Martinez <jmartinez@gitlab.com> | 2021-08-10 06:23:16 +0300 |
commit | fb8ad8e35513b6b2ca230f9f814ae06ec19ae806 (patch) | |
tree | 2c950a1fbefea7e69ff01257aa66dc9f551ba2bc /internal/artifact | |
parent | 029392ffad5c5533cdc916422b88711e31be1bfe (diff) | |
parent | dc6802f43525dc5308c0efa4b2ceb0bbfd6368c3 (diff) |
Merge branch 'fix/no-ctx' into 'master'
fix: propagate context to sub requests
See merge request gitlab-org/gitlab-pages!538
Diffstat (limited to 'internal/artifact')
-rw-r--r-- | internal/artifact/artifact.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/artifact/artifact.go b/internal/artifact/artifact.go index eff46ba7..3cb9c940 100644 --- a/internal/artifact/artifact.go +++ b/internal/artifact/artifact.go @@ -77,7 +77,7 @@ func (a *Artifact) TryMakeRequest(host string, w http.ResponseWriter, r *http.Re } func (a *Artifact) makeRequest(w http.ResponseWriter, r *http.Request, reqURL *url.URL, token string, additionalHandler func(*http.Response) bool) { - req, err := http.NewRequest("GET", reqURL.String(), nil) + req, err := http.NewRequestWithContext(r.Context(), "GET", reqURL.String(), nil) if err != nil { logging.LogRequest(r).WithError(err).Error(createArtifactRequestErrMsg) errortracking.Capture(err, errortracking.WithRequest(r)) |