net/http: make Transport.RoundTrip preserve Requests
Ensure that the exact Request passed to Transport.RoundTrip
is returned in the Response. Do not replace the Request with
a copy when resetting the request body.
Fixes #39533
Change-Id: Ie6fb080c24b0f6625b0761b7aa542af3d2411817
Reviewed-on: https://go-review.googlesource.com/c/go/+/237560
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
diff --git a/src/net/http/transport.go b/src/net/http/transport.go
index da86b261..a41e732 100644
--- a/src/net/http/transport.go
+++ b/src/net/http/transport.go
@@ -511,6 +511,7 @@
}
}
+ origReq := req
req = setupRewindBody(req)
if altRT := t.alternateRoundTripper(req); altRT != nil {
@@ -572,6 +573,7 @@
resp, err = pconn.roundTrip(treq)
}
if err == nil {
+ resp.Request = origReq
return resp, nil
}
diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go
index 99056a4..31a41f5 100644
--- a/src/net/http/transport_test.go
+++ b/src/net/http/transport_test.go
@@ -3511,7 +3511,8 @@
for i := 0; i < 3; i++ {
t0 := time.Now()
- res, err := c.Do(tc.req())
+ req := tc.req()
+ res, err := c.Do(req)
if err != nil {
if time.Since(t0) < MaxWriteWaitBeforeConnReuse/2 {
mu.Lock()
@@ -3522,6 +3523,9 @@
t.Skipf("connection likely wasn't recycled within %d, interfering with actual test; skipping", MaxWriteWaitBeforeConnReuse)
}
res.Body.Close()
+ if res.Request != req {
+ t.Errorf("Response.Request != original request; want identical Request")
+ }
}
mu.Lock()
