fix v2ray#1496

derek964 · Jan 3, 2019 · ce91e92 · ce91e92
1 parent 163fe25
commit ce91e92
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/common/buf/reader.go b/common/buf/reader.go
@@ -148,12 +148,13 @@ func (r *BufferedReader) WriteTo(writer io.Writer) (int64, error) {
 	return nBytes, err
 }
 
+// Interrupt implements common.Interruptible.
+func (r *BufferedReader) Interrupt() {
+	common.Interrupt(r.Reader)
+}
+
 // Close implements io.Closer.
 func (r *BufferedReader) Close() error {
-	if !r.Buffer.IsEmpty() {
-		ReleaseMulti(r.Buffer)
-		r.Buffer = nil
-	}
 	return common.Close(r.Reader)
 }
 

diff --git a/common/net/connection.go b/common/net/connection.go
@@ -115,7 +115,7 @@ func (c *connection) WriteMultiBuffer(mb buf.MultiBuffer) error {
 // Close implements net.Conn.Close().
 func (c *connection) Close() error {
 	common.Must(c.done.Close())
-	common.Close(c.reader)
+	common.Interrupt(c.reader)
 	common.Close(c.writer)
 	if c.onClose != nil {
 		return c.onClose.Close()