Skip to content

Commit fb4a091

Browse files
authored
backport: header deepcopy fix (#1110)
1 parent 52f3f39 commit fb4a091

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

middleware.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func createHTTPRequest(c *Client, r *Request) (err error) {
244244
r.RawRequest.Close = c.closeConnection
245245

246246
// Add headers into http request
247-
r.RawRequest.Header = r.Header
247+
r.RawRequest.Header = r.Header.Clone()
248248

249249
// Add cookies from client instance into http request
250250
for _, cookie := range c.Cookies {

request_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,8 @@ func TestRequestAuthScheme(t *testing.T) {
703703

704704
assertError(t, err)
705705
assertEqual(t, http.StatusOK, resp.StatusCode())
706-
assertEqual(t, tokenValue, resp.Request.Header.Get(hdrAuthorizationKey))
706+
assertEqual(t, "", resp.Request.Header.Get(hdrAuthorizationKey))
707+
assertEqual(t, tokenValue, resp.Request.RawRequest.Header.Get(hdrAuthorizationKey))
707708
})
708709

709710
t.Run("empty auth scheme at request level GH954", func(t *testing.T) {
@@ -720,7 +721,8 @@ func TestRequestAuthScheme(t *testing.T) {
720721

721722
assertError(t, err)
722723
assertEqual(t, http.StatusOK, resp.StatusCode())
723-
assertEqual(t, tokenValue, resp.Request.Header.Get(hdrAuthorizationKey))
724+
assertEqual(t, "", resp.Request.Header.Get(hdrAuthorizationKey))
725+
assertEqual(t, tokenValue, resp.Request.RawRequest.Header.Get(hdrAuthorizationKey))
724726
})
725727

726728
t.Run("only client level auth token GH959", func(t *testing.T) {
@@ -735,7 +737,8 @@ func TestRequestAuthScheme(t *testing.T) {
735737

736738
assertError(t, err)
737739
assertEqual(t, http.StatusOK, resp.StatusCode())
738-
assertEqual(t, "Bearer "+tokenValue, resp.Request.Header.Get(hdrAuthorizationKey))
740+
assertEqual(t, "", resp.Request.Header.Get(hdrAuthorizationKey))
741+
assertEqual(t, "Bearer "+tokenValue, resp.Request.RawRequest.Header.Get(hdrAuthorizationKey))
739742
})
740743

741744
}

0 commit comments

Comments
 (0)