Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #6082 Reduce SSL buffer compaction (#6083) #6142

Merged
merged 1 commit into from
Apr 7, 2021
Merged

Fix #6082 Reduce SSL buffer compaction (#6083) #6142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,7 +671,6 @@ public int fill(ByteBuffer buffer) throws IOException
else
{
appIn = _decryptedInput;
BufferUtil.compact(_encryptedInput);
}

// Let's try reading some encrypted data... even if we have some already.
Expand Down Expand Up @@ -729,12 +728,18 @@ public int fill(ByteBuffer buffer) throws IOException
return filled = -1;

case BUFFER_UNDERFLOW:
// Continue if we can compact?
if (BufferUtil.compact(_encryptedInput))
continue;

// Are we out of space?
if (BufferUtil.space(_encryptedInput) == 0)
{
BufferUtil.clear(_encryptedInput);
throw new SSLHandshakeException("Encrypted buffer max length exceeded");
}

// if we just filled some
if (netFilled > 0)
continue; // try filling some more

Expand Down