Skip to content
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

Jump to bottom

Removed reset process for request Body for temporary support #342

Closed
wants to merge 12 commits into from
Closed

Removed reset process for request Body for temporary support #342

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3d11ba7
⏪ refs https://github.com/getkin/kin-openapi/pull/672, https://github…
k2tzumi Dec 2, 2022
687e955
✏️ Update content length after replacing request body
k2tzumi Dec 2, 2022
5c7ff13
✏️ Update ContentLength before reading buffer.
k2tzumi Dec 2, 2022
043dca6
⏪ revert.
k2tzumi Dec 3, 2022
bd9698c
✏️ Update content length after replacing request body
k2tzumi Dec 3, 2022
05d46a0
✏️ depracate ioutil
k2tzumi Dec 3, 2022
695f417
✏️ Fix
k2tzumi Dec 3, 2022
557a7c8
✏️ Replacing the processing order
k2tzumi Dec 3, 2022
85f1664
♻️ Use io.TeeReader.
k2tzumi Dec 4, 2022
ca0878a
🐛 Fixed infinite loop
k2tzumi Dec 4, 2022
1808d68
✏️ Get content length written to buffer with io.TeeReader.
k2tzumi Dec 4, 2022
b193ce8
✏️ Fix
k2tzumi Dec 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 4 additions & 11 deletions http.go
View file
Open in desktop
Expand Up @@ -238,7 +238,8 @@ func (rnr *httpRunner) Run(ctx context.Context, r *httpRequest) error {
if err != nil {
return err
}
req, err = http.NewRequestWithContext(ctx, r.method, u.String(), reqBody)
bw := new(bytes.Buffer)
req, err = http.NewRequestWithContext(ctx, r.method, u.String(), io.TeeReader(reqBody, bw))
if err != nil {
return err
}
Expand All @@ -252,16 +253,8 @@ func (rnr *httpRunner) Run(ctx context.Context, r *httpRequest) error {
if err := rnr.validator.ValidateRequest(ctx, req); err != nil {
return err
}
// reset Request.Body
reqBody, err := r.encodeBody()
if err != nil {
return err
}
rc, ok := reqBody.(io.ReadCloser)
if !ok && reqBody != nil {
rc = io.NopCloser(reqBody)
}
req.Body = rc
// reset ContentLength
req.ContentLength = int64(bw.Len())

r.setContentTypeHeader(req)
for k, v := range r.headers {
Expand Down