Merge pull request #23 from DavidCai1993/master

handle deflate compressed response
mozillazg · Nov 7, 2016 · 71ec6a1 · 71ec6a1
2 parents fb2aa53 + 3ea31fa
commit 71ec6a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/request.go b/request.go
@@ -11,7 +11,7 @@ import (
 )
 
 // Version export version
-const Version = "0.6.0"
+const Version = "0.7.0"
 
 // DefaultClient for NewArgs and NewRequest
 var DefaultClient = new(http.Client)

diff --git a/response.go b/response.go
@@ -1,6 +1,7 @@
 package request
 
 import (
+	"compress/flate"
 	"compress/gzip"
 	"io"
 	"io/ioutil"
@@ -34,20 +35,23 @@ func (resp *Response) Content() (b []byte, err error) {
 	var reader io.ReadCloser
 	switch resp.Header.Get("Content-Encoding") {
 	case "gzip":
-		reader, err := gzip.NewReader(resp.Body)
-		if err != nil {
+		if reader, err = gzip.NewReader(resp.Body); err != nil {
 			return nil, err
 		}
-		b, err = ioutil.ReadAll(reader)
+
+		defer reader.Close()
+	case "deflate":
+		reader = flate.NewReader(resp.Body)
+
 		defer reader.Close()
 	default:
 		reader = resp.Body
-		b, err = ioutil.ReadAll(reader)
 	}
 
-	if err != nil {
+	if b, err = ioutil.ReadAll(reader); err != nil {
 		return nil, err
 	}
+
 	resp.content = b
 	return b, err
 }