mirror/groupcache
1
0
Fork 0
mirror of https://github.com/mailgun/groupcache.git synced 2024-11-16 14:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(all): merging master and resolving conflicts

Browse Source
This commit is contained in:
censhin 2021-10-04 15:23:05 -04:00
commit 1081294c45
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -2,7 +2,7 @@ language: go
go_import_path: github.com/mailgun/groupcache go_import_path: github.com/mailgun/groupcache
os: linux os: linux
dist: trusty dist: xenial
sudo: false sudo: false
script: script:
@ -12,6 +12,7 @@ go:
- 1.13.x - 1.13.x
- 1.14.x - 1.14.x
- 1.15.x - 1.15.x
- 1.17.x
- master - master
cache: cache:

6
http.go
View File

@ -274,15 +274,11 @@ func (h *httpGetter) makeRequest(ctx context.Context, m string, in request, b io
url.QueryEscape(in.GetGroup()), url.QueryEscape(in.GetGroup()),
url.QueryEscape(in.GetKey()), url.QueryEscape(in.GetKey()),
) )
req, err := http.NewRequestWithContext(ctx, method, u, nil)
req, err := http.NewRequest(m, u, b)
if err != nil { if err != nil {
return err return err
} }
// Pass along the context to the RoundTripper
req = req.WithContext(ctx)
tr := http.DefaultTransport tr := http.DefaultTransport
if h.getTransport != nil { if h.getTransport != nil {
tr = h.getTransport(ctx) tr = h.getTransport(ctx)