github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

fix #1496

pull/1869/head^2 v4.10.0
Darien Raymond 2019-01-04 00:24:28 +01:00
parent 163fe2523e
commit ce91e92435
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/buf/reader.go
View File

@ -148,12 +148,13 @@ func (r *BufferedReader) WriteTo(writer io.Writer) (int64, error) {
return nBytes, err return nBytes, err
} }
// Interrupt implements common.Interruptible.
func (r *BufferedReader) Interrupt() {
common.Interrupt(r.Reader)
}
// Close implements io.Closer. // Close implements io.Closer.
func (r *BufferedReader) Close() error { func (r *BufferedReader) Close() error {
if !r.Buffer.IsEmpty() {
ReleaseMulti(r.Buffer)
r.Buffer = nil
}
return common.Close(r.Reader) return common.Close(r.Reader)
} }

2
common/net/connection.go
View File

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