fix pipe close

ginuerzh · Oct 12, 2016 · 6ca1f4a · 6ca1f4a
1 parent 659dce0
commit 6ca1f4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/chain.go b/chain.go
@@ -7,7 +7,7 @@ import (
 	"github.com/golang/glog"
 	"golang.org/x/net/http2"
 	"io"
-	"io/ioutil"
+	//"io/ioutil"
 	"net"
 	"net/http"
 	"net/http/httputil"
@@ -238,7 +238,7 @@ func (c *ProxyChain) getHttp2Conn(header http.Header) (net.Conn, error) {
 		Proto:         "HTTP/2.0",
 		ProtoMajor:    2,
 		ProtoMinor:    0,
-		Body:          ioutil.NopCloser(pr),
+		Body:          pr,
 		Host:          http2Node.Addr,
 		ContentLength: -1,
 	}

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