From 0a094762151f281cdba54ace3b7e5c9c549a96a7 Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 9 Feb 2011 21:56:14 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50747
 Allow the content length header to be set up to the point the response is
 committed when a writer is used.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1069131 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/connector/Response.java | 3 ---
 webapps/docs/changelog.xml                       | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java
index 86b1018a4..00eb84406 100644
--- a/java/org/apache/catalina/connector/Response.java
+++ b/java/org/apache/catalina/connector/Response.java
@@ -756,9 +756,6 @@ public class Response
         if (included)
             return;
         
-        if (usingWriter)
-            return;
-        
         coyoteResponse.setContentLength(length);
 
     }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9c22ba93a..d203ff196 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -63,6 +63,10 @@
         <code>org.apache.catalina.util.LifecycleBase</code> correctly implement
         the expected state transitions. (markt)
       </add>
+      <fix>
+        <bug>50747</bug>: Allow the content length header to be set up to the
+        point the response is committed when a writer is beng used. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Tribes">
-- 
2.11.0