cadey
/
route
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "internal/tun2: forward stream buffered reader and closer to response bodies" 

This reverts commit 223b816f88.
This commit is contained in:
Cadey Ratio 2017-10-03 06:34:21 -07:00
parent 99d5acb880
commit 88d0a0a619
No known key found for this signature in database
GPG Key ID: D607EE27C2E7F89A
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/tun2/connection.go
View File

@ -2,8 +2,8 @@ package tun2
import ( import (
"bufio" "bufio"
"bytes"
"context" "context"
"io"
"io/ioutil" "io/ioutil"
"net" "net"
"net/http" "net/http"
@ -127,6 +127,7 @@ func (c *Connection) RoundTrip(req *http.Request) (*http.Response, error) {
if err != nil { if err != nil {
return nil, errors.Wrap(err, ErrCantOpenSessionStream.Error()) return nil, errors.Wrap(err, ErrCantOpenSessionStream.Error())
} }
defer stream.Close()
err = req.Write(stream) err = req.Write(stream)
if err != nil { if err != nil {
@ -146,17 +147,8 @@ func (c *Connection) RoundTrip(req *http.Request) (*http.Response, error) {
return nil, errors.Wrap(err, "can't read response body") return nil, errors.Wrap(err, "can't read response body")
} }
resp.Body = &mixedReadCloser{ resp.Body = ioutil.NopCloser(bytes.NewBuffer(body))
Reader: buf,
Closer: stream,
}
resp.ContentLength = int64(len(body)) resp.ContentLength = int64(len(body))
return resp, nil return resp, nil
} }
type mixedReadCloser struct {
io.Reader
io.Closer
}