remm 01/03/05 21:07:45
Modified: catalina/src/share/org/apache/catalina/connector/http
HttpResponseImpl.java
Log:
- Only set content length to 0 if it's not an error (if it is, an error message will
be printed by the superclass).
Revision Changes Path
1.8 +12 -7
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseImpl.java
Index: HttpResponseImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HttpResponseImpl.java 2001/02/03 07:48:32 1.7
+++ HttpResponseImpl.java 2001/03/06 05:07:45 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseImpl.java,v
1.7 2001/02/03 07:48:32 remm Exp $
- * $Revision: 1.7 $
- * $Date: 2001/02/03 07:48:32 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseImpl.java,v
1.8 2001/03/06 05:07:45 remm Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/03/06 05:07:45 $
*
* ====================================================================
*
@@ -70,6 +70,7 @@
import java.io.OutputStream;
import java.util.ArrayList;
import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.connector.HttpResponseBase;
@@ -78,7 +79,7 @@
*
* @author Craig R. McClanahan
* @author <a href="mailto:[EMAIL PROTECTED]">Remy Maucherat</a>
- * @version $Revision: 1.7 $ $Date: 2001/02/03 07:48:32 $
+ * @version $Revision: 1.8 $ $Date: 2001/03/06 05:07:45 $
*/
final class HttpResponseImpl
@@ -263,9 +264,13 @@
*/
public void finishResponse() throws IOException {
- if ((!isStreamInitialized()) && (getContentLength() == -1)
- && (getStatus() != SC_NOT_MODIFIED))
- setContentLength(0);
+ if (getStatus() < HttpServletResponse.SC_BAD_REQUEST) {
+ if ((!isStreamInitialized()) && (getContentLength() == -1)
+ && (getStatus() != SC_NOT_MODIFIED))
+ setContentLength(0);
+ } else {
+ setHeader("Connection", "close");
+ }
super.finishResponse();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
