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

Forward port of PR #7778 to `jetty-12.0.x`. 

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2022-10-10 16:22:26 +02:00
parent 4532161b13
commit 2cbb0e19e0
No known key found for this signature in database
GPG Key ID: 1677D141BCF3584D
2 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/HttpInput.java
View File

@ -138,14 +138,34 @@ public class HttpInput extends ServletInputStream implements Runnable
}
}
private int get(Content.Chunk content, byte[] bytes, int offset, int length)
private int get(Content.Chunk chunk, byte[] bytes, int offset, int length)
{
length = Math.min(content.remaining(), length);
content.getByteBuffer().get(bytes, offset, length);
length = Math.min(chunk.remaining(), length);
chunk.getByteBuffer().get(bytes, offset, length);
_contentConsumed.add(length);
return length;
}
private int get(Content.Chunk chunk, ByteBuffer des)
{
var capacity = des.remaining();
var src = chunk.getByteBuffer();
if (src.remaining() > capacity)
{
int limit = src.limit();
src.limit(src.position() + capacity);
des.put(src);
src.limit(limit);
}
else
{
des.put(src);
}
var consumed = capacity - des.remaining();
_contentConsumed.add(consumed);
return consumed;
}
public long getContentConsumed()
{
return _contentConsumed.sum();
@ -257,6 +277,16 @@ public class HttpInput extends ServletInputStream implements Runnable
@Override
public int read(byte[] b, int off, int len) throws IOException
{
return read(null, b, off, len);
}
public int read(ByteBuffer buffer) throws IOException
{
return read(buffer, null, -1, -1);
}
private int read(ByteBuffer buffer, byte[] b, int off, int len) throws IOException
{
try (AutoLock lock = _contentProducer.lock())
{
@ -272,7 +302,7 @@ public class HttpInput extends ServletInputStream implements Runnable
throw new IllegalStateException("read on unready input");
if (!chunk.isTerminal())
{
int read = get(chunk, b, off, len);
int read = buffer == null ? get(chunk, b, off, len) : get(chunk, buffer);
if (LOG.isDebugEnabled())
LOG.debug("read produced {} byte(s) {}", read, this);
if (!chunk.hasRemaining())

38
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpInput.java
View File

@ -131,14 +131,34 @@ public class HttpInput extends ServletInputStream implements Runnable
}
}
private int get(Content.Chunk content, byte[] bytes, int offset, int length)
private int get(Content.Chunk chunk, byte[] bytes, int offset, int length)
{
length = Math.min(content.remaining(), length);
content.getByteBuffer().get(bytes, offset, length);
length = Math.min(chunk.remaining(), length);
chunk.getByteBuffer().get(bytes, offset, length);
_contentConsumed.add(length);
return length;
}
private int get(Content.Chunk chunk, ByteBuffer des)
{
var capacity = des.remaining();
var src = chunk.getByteBuffer();
if (src.remaining() > capacity)
{
int limit = src.limit();
src.limit(src.position() + capacity);
des.put(src);
src.limit(limit);
}
else
{
des.put(src);
}
var consumed = capacity - des.remaining();
_contentConsumed.add(consumed);
return consumed;
}
public long getContentConsumed()
{
return _contentConsumed.sum();
@ -262,6 +282,16 @@ public class HttpInput extends ServletInputStream implements Runnable
@Override
public int read(byte[] b, int off, int len) throws IOException
{
return read(null, b, off, len);
}
public int read(ByteBuffer buffer) throws IOException
{
return read(buffer, null, -1, -1);
}
private int read(ByteBuffer buffer, byte[] b, int off, int len) throws IOException
{
try (AutoLock lock = _contentProducer.lock())
{
@ -298,7 +328,7 @@ public class HttpInput extends ServletInputStream implements Runnable
}
else
{
int read = get(content, b, off, len);
int read = buffer == null ? get(content, b, off, len) : get(content, buffer);
if (LOG.isDebugEnabled())
LOG.debug("read produced {} byte(s) {}", read, this);
if (!content.hasRemaining())