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

transport/ray/direct.go

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