(tomcat) branch 11.0.x updated: Additional case where content length can be set

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/11.0.x by this push:
     new f1933a1af0 Additional case where content length can be set
f1933a1af0 is described below

commit f1933a1af06bf3fa10452d508db1592da20de173
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 17 10:28:48 2025 +0100

    Additional case where content length can be set
---
 java/org/apache/catalina/servlets/DefaultServlet.java | 2 +-
 webapps/docs/changelog.xml                            | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index 947b08d1f9..23880e5eb5 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1089,7 +1089,7 @@ public class DefaultServlet extends HttpServlet {
                     response.setContentType(contentType);
                 }
             }
-            if (resource.isFile() && contentLength >= 0 && (!serveContent || 
ostream != null)) {
+            if (resource.isFile() && contentLength >= 0 && (!serveContent || 
ostream != null || writer != null)) {
                 if (debug > 0) {
                     log("DefaultServlet.serveFile:  contentLength=" + 
contentLength);
                 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c970850c7a..3b719671ed 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -115,6 +115,11 @@
         Optimize <code>Request#getCharsetHolder</code> to avoid repeated 
parsing
         when charset is null. Patch provided by morning-gu. (schultz)
       </update>
+      <fix>
+        Allow the default servlet to set the content length when the content
+        length is known, no content has been written and a <code>Writer</code>
+        is being used. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Web applications">


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org