github/smux
4
0
Fork 0
mirror of https://github.com/xtaci/smux.git synced 2024-04-21 10:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27 from longzhiri/master

Browse Source 
fix bug: read 0 bytes from a stream will block forever
This commit is contained in:
xtaci
2018-01-04 17:41:28 +08:00
committed by GitHub
parent c3e18246ff d502b06712
commit e28719eede
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stream.go
+9
View File
@@ -44,6 +44,15 @@ func (s *Stream) ID() uint32 {
// Read implements net.Conn // Read implements net.Conn
func (s *Stream) Read(b []byte) (n int, err error) { func (s *Stream) Read(b []byte) (n int, err error) {
if len(b) == 0 {
select {
case <-s.die:
return 0, errors.New(errBrokenPipe)
default:
return 0, nil
}
}
var deadline <-chan time.Time var deadline <-chan time.Time
if d, ok := s.readDeadline.Load().(time.Time); ok && !d.IsZero() { if d, ok := s.readDeadline.Load().(time.Time); ok && !d.IsZero() {
timer := time.NewTimer(time.Until(d)) timer := time.NewTimer(time.Until(d))