From 965d1e6d16ae595fa6290744b0fc326a0ea83256 Mon Sep 17 00:00:00 2001
From: eson <474420502@qq.com>
Date: Sun, 23 Dec 2018 00:15:24 +0800
Subject: [PATCH] fix: FromResponse not return error.
---
response.go | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/response.go b/response.go
index d9f8e7a..f7e1be1 100644
--- a/response.go
+++ b/response.go
@@ -20,19 +20,10 @@ func FromHTTPResponse(resp *http.Response) (*Response, error) {
// 复制response 返回内容 并且测试是否有解压的需求
srcbuf, err := ioutil.ReadAll(resp.Body)
if err != nil {
- panic(err)
+ return nil, err
}
resp.Body.Close()
- // cbuf := bytes.NewBuffer([]byte{})
- // _, err = io.Copy(cbuf, bytes.NewReader(srcbuf))
-
- // if err != nil {
- // panic(err)
- // }
-
- // resp.Body = ioutil.NopCloser(cbuf)
-
content := ""
srcReader := bytes.NewReader(srcbuf)
@@ -40,14 +31,14 @@ func FromHTTPResponse(resp *http.Response) (*Response, error) {
defer r.Close()
buf, err := ioutil.ReadAll(r)
if err != nil {
- panic(err)
+ return nil, err
}
content = string(buf)
} else if r, err := zlib.NewReader(srcReader); err == nil {
defer r.Close()
buf, err := ioutil.ReadAll(r)
if err != nil {
- panic(err)
+ return nil, err
}
content = string(buf)
} else {