Handle response committed when processing read error
BZ68862
diff --git a/java/org/apache/catalina/connector/InputBuffer.java b/java/org/apache/catalina/connector/InputBuffer.java
index 03c9586..e22ef96 100644
--- a/java/org/apache/catalina/connector/InputBuffer.java
+++ b/java/org/apache/catalina/connector/InputBuffer.java
@@ -332,9 +332,21 @@
Response response = request.getResponse();
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, e);
if (e instanceof SocketTimeoutException) {
- response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+ try {
+ response.sendError(HttpServletResponse.SC_REQUEST_TIMEOUT);
+ } catch(IllegalStateException ex) {
+ // Response already committed
+ response.setStatus(HttpServletResponse.SC_REQUEST_TIMEOUT);
+ response.setError();
+ }
} else {
- response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+ try {
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+ } catch(IllegalStateException ex) {
+ // Response already committed
+ response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+ response.setError();
+ }
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5c21e3b..f15e82d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -122,6 +122,10 @@
file via the Servlet API and the file is larger than
<code>Integer.MAX_VALUE</code>. (markt)
</fix>
+ <fix>
+ <bug>68862</bug>: Handle possible response commit when processing read
+ errors. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
