Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion internal/transport/transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -368,14 +368,16 @@ func (s *Stream) ReadMessageHeader(header []byte) (err error) {
return er
}
s.readRequester.requestRead(len(header))
bytesRead := 0
for len(header) != 0 {
n, err := s.trReader.ReadMessageHeader(header)
bytesRead += n
header = header[n:]
if len(header) == 0 {
err = nil
}
if err != nil {
if n > 0 && err == io.EOF {
if bytesRead > 0 && err == io.EOF {
err = io.ErrUnexpectedEOF
}
return err
Expand Down
30 changes: 30 additions & 0 deletions internal/transport/transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3387,6 +3387,36 @@ func (s) TestReadMessageHeaderMultipleBuffers(t *testing.T) {
}
}

func (s) TestReadMessageHeaderPartialHeaderEOF(t *testing.T) {
const headerLen = 5
bytesRead := 0
s := Stream{
readRequester: &fakeReadRequester{},
}
s.buf.init()
recvBuffer := &s.buf
s.trReader = transportReader{
reader: recvBufferReader{
recv: recvBuffer,
},
windowHandler: &mockWindowUpdater{
f: func(i int) {
bytesRead += i
},
},
}

recvBuffer.put(recvMsg{buffer: make(mem.SliceBuffer, 3)})
recvBuffer.put(recvMsg{err: io.EOF})

if err := s.ReadMessageHeader(make([]byte, headerLen)); !errors.Is(err, io.ErrUnexpectedEOF) {
t.Fatalf("ReadMessageHeader() error = %v, want %v", err, io.ErrUnexpectedEOF)
}
if bytesRead != 3 {
t.Fatalf("bytesRead = %d, want 3", bytesRead)
}
}

// Tests a scenario when the client doesn't send an RST frame when the
// configured deadline is reached. The test verifies that the server sends an
// RST stream only after the deadline is reached.
Expand Down
Loading