Skip to content

Fix HTTP request cancellation propagation to upstream #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fsul7o merged 2 commits into from
Sep 17, 2026
Merged

Fix HTTP request cancellation propagation to upstream #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ac7cd8
fix: use NewRequestWithContext to preserve request context in proxy
gyakami Sep 7, 2026
eff9b96
Merge branch 'master' into fix/http-request-context-cancellation
fsul7o Sep 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions handler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ func New(cfg config.Proxy, bp httputil.BufferPool, prov service.Authorizationd,
u := *r.URL
u.Scheme = scheme
u.Host = host
req, err := http.NewRequest(r.Method, u.String(), r.Body)
req, err := http.NewRequestWithContext(r.Context(), r.Method, u.String(), r.Body)
if err != nil {
glg.Error(errors.Wrap(err, "NewRequest returned error"))
glg.Error(errors.Wrap(err, "NewRequestWithContext returned error"))
r.URL.Scheme = scheme
return
}
Expand Down
18 changes: 18 additions & 0 deletions handler/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,24 @@ func TestNew(t *testing.T) {
}
}

func TestNew_DirectorPreservesRequestContext(t *testing.T) {
proxy := New(config.Proxy{
Host: "127.0.0.1",
Port: 8080,
}, nil, nil, nil).(*httputil.ReverseProxy)

ctx, cancel := context.WithCancel(context.Background())
req := httptest.NewRequest(http.MethodGet, "http://example.com", nil).WithContext(ctx)
proxy.Director(req)
cancel()

select {
case <-req.Context().Done():
case <-time.After(time.Second):
t.Fatal("request context was not canceled")
}
}

func Test_updateDialContext(t *testing.T) {
type args struct {
cfg *http.Transport
Expand Down
Loading