Merge branch 'master' into port_5k

pion · Feb 28, 2024 · 16bde44 · 16bde44
2 parents 91433cf + 29d0811
commit 16bde44
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/stream.go b/stream.go
@@ -175,6 +175,11 @@ func (s *Stream) SetReadDeadline(deadline time.Time) error {
 				t.Stop()
 				return
 			case <-t.C:
+				select {
+				case <-readTimeoutCancel:
+					return
+				default:
+				}
 				s.lock.Lock()
 				if s.readErr == nil {
 					s.readErr = ErrReadDeadlineExceeded