package/requests
1
0
Fork 0
mirror of https://github.com/gospider007/requests.git synced 2025-12-24 13:57:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

optimize code

Browse Source
This commit is contained in:
bxd
2023-12-16 16:26:21 +08:00
parent b7a39e98d7
commit 948b2a5a9e
4 changed files with 55 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
response.go
View File

@@ -249,19 +249,12 @@ func (obj *Response) defaultDecode() bool {
return strings.Contains(obj.ContentType(), "html")
}
func (obj *Response) Read(con []byte) (i int, err error) {
done := make(chan struct{})
go func() {
i, err = obj.response.Body.Read(con)
close(done)
}()
select {
case <-obj.response.Request.Context().Done():
obj.ForceCloseConn()
err = obj.response.Request.Context().Err()
case <-done:
// must stream=true
func (obj *Response) Conn() *connecotr {
if obj.IsStream() {
return obj.rawConn.Conn()
}
return
return nil
}
// return true if response is stream
@@ -284,12 +277,17 @@ func (obj *Response) ReadBody() (err error) {
bufferPool.Put(bBody)
}()
if obj.bar && obj.ContentLength() > 0 {
err = tools.CopyWitchContext(obj.response.Request.Context(), &barBody{
_, err = io.Copy(&barBody{
bar: bar.NewClient(obj.response.ContentLength),
body: bBody,
}, obj.response.Body)
// err = tools.CopyWitchContext(obj.response.Request.Context(), &barBody{
// bar: bar.NewClient(obj.response.ContentLength),
// body: bBody,
// }, obj.response.Body)
} else {
err = tools.CopyWitchContext(obj.ctx, bBody, obj.response.Body)
_, err = io.Copy(bBody, obj.response.Body)
// err = tools.CopyWitchContext(obj.ctx, bBody, obj.response.Body)
}
if err != nil {
obj.ForceCloseConn()