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

Merge branch 'master' of https://github.com/v2ray/v2ray-core

pull/432/head
Darien Raymond 2017-03-27 11:12:36 +02:00
parent cb0e29ccdb bb4daedd4c
commit 8ce6e741f1
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
transport/ray/direct.go
View File

@ -88,6 +88,10 @@ func (v *Stream) ReadTimeout(timeout time.Duration) (*buf.Buffer, error) {
case b := <-v.buffer: case b := <-v.buffer:
return b, nil return b, nil
default: default:
if timeout == 0 {
return nil, ErrReadTimeout
}
select { select {
case <-v.ctx.Done(): case <-v.ctx.Done():
return nil, io.ErrClosedPipe return nil, io.ErrClosedPipe