root/gost_software
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pipe close

Browse Source
This commit is contained in:
rui.zheng 2016-10-12 17:41:07 +08:00
parent 659dce0e12
commit 6ca1f4a984
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chain.go
View File

@ -7,7 +7,7 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"golang.org/x/net/http2" "golang.org/x/net/http2"
"io" "io"
"io/ioutil" //"io/ioutil"
"net" "net"
"net/http" "net/http"
"net/http/httputil" "net/http/httputil"
@ -238,7 +238,7 @@ func (c *ProxyChain) getHttp2Conn(header http.Header) (net.Conn, error) {
Proto: "HTTP/2.0", Proto: "HTTP/2.0",
ProtoMajor: 2, ProtoMajor: 2,
ProtoMinor: 0, ProtoMinor: 0,
Body: ioutil.NopCloser(pr), Body: pr,
Host: http2Node.Addr, Host: http2Node.Addr,
ContentLength: -1, ContentLength: -1,
} }

11
http.go
View File

@ -311,11 +311,14 @@ func (c *http2Conn) Write(b []byte) (n int, err error) {
return c.w.Write(b) return c.w.Write(b)
} }
func (c *http2Conn) Close() error { func (c *http2Conn) Close() (err error) {
if rc, ok := c.r.(io.ReadCloser); ok { if rc, ok := c.r.(io.Closer); ok {
return rc.Close() err = rc.Close()
} }
return nil if w, ok := c.w.(io.Closer); ok {
err = w.Close()
}
return
} }
func (c *http2Conn) LocalAddr() net.Addr { func (c *http2Conn) LocalAddr() net.Addr {