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

Customizable error page buffer size #11654

Merged
merged 5 commits into from
Aug 29, 2024
Merged

Customizable error page buffer size #11654

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83b02de
Customizable error page buffer size
dkaukov Apr 15, 2024
ecc45e9
Merge branch 'jetty-12.0.x' into error-page-buff-size
dkaukov May 23, 2024
852b5b1
PR feedback
dkaukov May 23, 2024
8bf642a
Merge branch 'jetty-12.0.x' into error-page-buff-size
gregw Aug 28, 2024
008ae3c
Update ErrorHandler.java
gregw Aug 29, 2024
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
10 changes: 8 additions & 2 deletions jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,7 @@ else if (charsets.contains(StandardCharsets.ISO_8859_1))
return false;
}

int bufferSize = request.getConnectionMetaData().getHttpConfiguration().getOutputBufferSize();
bufferSize = Math.min(8192, bufferSize); // TODO ?
int bufferSize = getBufferSize(request);
RetainableByteBuffer buffer = request.getComponents().getByteBufferPool().acquire(bufferSize, false);

try
Expand Down Expand Up @@ -262,6 +261,13 @@ else if (charsets.contains(StandardCharsets.ISO_8859_1))
}
}

protected int getBufferSize(Request request)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need a bit of javadoc to say that this is getting the buffer size for the entire error response (any larger responses will be truncated). Then say that default implementation imposes an 8K limit on the standard buffer size, but that implementations may override the method to provide some other size.

{
int bufferSize = request.getConnectionMetaData().getHttpConfiguration().getOutputBufferSize();
bufferSize = Math.min(8192, bufferSize); // TODO ?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's remove the TODO from the code

return bufferSize;
}

protected void writeErrorHtml(Request request, Writer writer, Charset charset, int code, String message, Throwable cause, boolean showStacks) throws IOException
{
if (message == null)
Expand Down