Skip to content

fix #164 #165

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
merged 2 commits into from
Jun 26, 2018
Merged

fix #164 #165

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
cd09659
add test case for auto gzip response
Jack47 Jun 26, 2018
fe48d70
#164 don't use gziped reader when response content-length is zero
Jack47 Jun 26, 2018
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
2 changes: 1 addition & 1 deletion client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ func (c *Client) execute(req *Request) (*Response, error) {
body := resp.Body

// GitHub #142
if strings.EqualFold(resp.Header.Get(hdrContentEncodingKey), "gzip") {
if strings.EqualFold(resp.Header.Get(hdrContentEncodingKey), "gzip") && resp.ContentLength > 0 {
if _, ok := body.(*gzip.Reader); !ok {
body, err = gzip.NewReader(body)
if err != nil {
Expand Down
26 changes: 16 additions & 10 deletions client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,16 +479,22 @@ func TestAutoGzip(t *testing.T) {
defer ts.Close()

c := New()
testcases := []struct{ url, want string }{
{ts.URL + "/gzip-test", "This is Gzip response testing"},
{ts.URL + "/gzip-test-gziped-empty-body", ""},
{ts.URL + "/gzip-test-no-gziped-body", ""},
}
for _, tc := range testcases {
resp, err := c.R().
SetHeader("Accept-Encoding", "gzip").
Get(tc.url)

resp, err := c.R().
SetHeader("Accept-Encoding", "gzip").
Get(ts.URL + "/gzip-test")

assertError(t, err)
assertEqual(t, http.StatusOK, resp.StatusCode())
assertEqual(t, "200 OK", resp.Status())
assertNotNil(t, resp.Body())
assertEqual(t, "This is Gzip response testing", resp.String())
assertError(t, err)
assertEqual(t, http.StatusOK, resp.StatusCode())
assertEqual(t, "200 OK", resp.Status())
assertNotNil(t, resp.Body())
assertEqual(t, tc.want, resp.String())

logResponse(t, resp)
logResponse(t, resp)
}
}
12 changes: 12 additions & 0 deletions resty_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,19 @@ func createGenServer(t *testing.T) *httptest.Server {
zw := gzip.NewWriter(w)
zw.Write([]byte("This is Gzip response testing"))
zw.Close()
} else if r.URL.Path == "/gzip-test-gziped-empty-body" {
w.Header().Set(hdrContentTypeKey, plainTextType)
w.Header().Set(hdrContentEncodingKey, "gzip")
zw := gzip.NewWriter(w)
// write gziped empty body
zw.Write([]byte(""))
zw.Close()
} else if r.URL.Path == "/gzip-test-no-gziped-body" {
w.Header().Set(hdrContentTypeKey, plainTextType)
w.Header().Set(hdrContentEncodingKey, "gzip")
// don't write body
}

return
}

Expand Down