Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #6728 - QUIC and HTTP/3 

- Fixed computation of the last flag.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2021-09-24 16:47:12 +02:00
parent 4bee790c04
commit 539fee7f79
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jetty-http3/http3-common/src/main/java/org/eclipse/jetty/http3/internal/parser/DataBodyParser.java
View File

@ -46,7 +46,7 @@ public class DataBodyParser extends BodyParser
@Override @Override
protected void emptyBody(ByteBuffer buffer) protected void emptyBody(ByteBuffer buffer)
{ {
onData(BufferUtil.EMPTY_BUFFER, false); onData(BufferUtil.EMPTY_BUFFER, isLast.getAsBoolean(), false);
} }
@Override @Override
@ -72,17 +72,21 @@ public class DataBodyParser extends BodyParser
buffer.limit(limit); buffer.limit(limit);
buffer.position(position + size); buffer.position(position + size);
// If the buffer contains another frame that
// needs to be parsed, then it's not the last frame.
boolean last = isLast.getAsBoolean() && !buffer.hasRemaining();
length -= size; length -= size;
if (length == 0) if (length == 0)
{ {
reset(); reset();
onData(slice, false); onData(slice, last, false);
return Result.WHOLE_FRAME; return Result.WHOLE_FRAME;
} }
else else
{ {
// We got partial data, simulate a smaller frame, and stay in DATA state. // We got partial data, simulate a smaller frame, and stay in DATA state.
onData(slice, true); onData(slice, last, true);
return Result.FRAGMENT_FRAME; return Result.FRAGMENT_FRAME;
} }
} }
@ -95,9 +99,9 @@ public class DataBodyParser extends BodyParser
return Result.NO_FRAME; return Result.NO_FRAME;
} }
private void onData(ByteBuffer buffer, boolean fragment) private void onData(ByteBuffer buffer, boolean last, boolean fragment)
{ {
DataFrame frame = new DataFrame(buffer, isLast.getAsBoolean()); DataFrame frame = new DataFrame(buffer, last);
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("notifying fragment={} {}#{} remaining={}", fragment, frame, streamId, length); LOG.debug("notifying fragment={} {}#{} remaining={}", fragment, frame, streamId, length);
notifyData(frame); notifyData(frame);