cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpResponseStream.java
remm02/02/20 17:27:34
Modified:catalina/src/share/org/apache/catalina/connector/http Tag:
tomcat_40_branch HttpResponseStream.java
Log:
- Port NPE fix from HEAD branch.
Revision ChangesPath
No revision
No revision
1.7.2.4 +4 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
Index: HttpResponseStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -r1.7.2.3 -r1.7.2.4
--- HttpResponseStream.java 27 Nov 2001 21:35:39 - 1.7.2.3
+++ HttpResponseStream.java 21 Feb 2002 01:27:34 - 1.7.2.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.7.2.3 2001/11/27 21:35:39 remm Exp $
- * $Revision: 1.7.2.3 $
- * $Date: 2001/11/27 21:35:39 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.7.2.4 2002/02/21 01:27:34 remm Exp $
+ * $Revision: 1.7.2.4 $
+ * $Date: 2002/02/21 01:27:34 $
*
*
*
@@ -250,7 +250,7 @@
protected void checkHead(HttpResponseImpl response) {
HttpServletRequest servletRequest =
(HttpServletRequest) response.getRequest();
-if (servletRequest.getMethod().equals("HEAD"))
+if ("HEAD".equals(servletRequest.getMethod()))
writeContent = false;
else
writeContent = true;
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpResponseStream.java
remm02/02/20 15:00:18
Modified:catalina/src/share/org/apache/catalina/connector/http
HttpResponseStream.java
Log:
- Code cleanup, submitted by Paul Speed.
Revision ChangesPath
1.13 +4 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
Index: HttpResponseStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HttpResponseStream.java 20 Feb 2002 19:24:38 - 1.12
+++ HttpResponseStream.java 20 Feb 2002 23:00:18 - 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.12 2002/02/20 19:24:38 remm Exp $
- * $Revision: 1.12 $
- * $Date: 2002/02/20 19:24:38 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.13 2002/02/20 23:00:18 remm Exp $
+ * $Revision: 1.13 $
+ * $Date: 2002/02/20 23:00:18 $
*
*
*
@@ -250,8 +250,7 @@
protected void checkHead(HttpResponseImpl response) {
HttpServletRequest servletRequest =
(HttpServletRequest) response.getRequest();
-if ((servletRequest.getMethod() != null)
-&& (servletRequest.getMethod().equals("HEAD"))) {
+if ("HEAD".equals(servletRequest.getMethod())) {
writeContent = false;
} else {
writeContent = true;
--
To unsubscribe, e-mail:
For additional commands, e-mail:
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpResponseStream.java
Sorry to comment, but I see this one again and again on all kinds of
projects. :)
> -if (servletRequest.getMethod().equals("HEAD"))
> +if ((servletRequest.getMethod() != null)
> +&& (servletRequest.getMethod().equals("HEAD"))) {
Almost always better to go ahead and invert the equals:
if ("HEAD".equals(servletRequest.getMethod()))
A simpler idiom to remember and will save the null check. Just a
friendly tip.
-Paul
[EMAIL PROTECTED] wrote:
>
> remm02/02/20 11:24:38
>
> Modified:catalina/src/share/org/apache/catalina/connector/http
> HttpResponseStream.java
> Log:
> - Fix a NPE which could happen with an invalid request.
>
> Revision ChangesPath
> 1.12 +7 -5
>jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
>
> Index: HttpResponseStream.java
> ===
> RCS file:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -r1.11 -r1.12
> --- HttpResponseStream.java 27 Nov 2001 16:22:47 - 1.11
> +++ HttpResponseStream.java 20 Feb 2002 19:24:38 - 1.12
> @@ -1,7 +1,7 @@
>/*
> - * $Header:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
> 1.11 2001/11/27 16:22:47 remm Exp $
> - * $Revision: 1.11 $
> - * $Date: 2001/11/27 16:22:47 $
> + * $Header:
>/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
> 1.12 2002/02/20 19:24:38 remm Exp $
> + * $Revision: 1.12 $
> + * $Date: 2002/02/20 19:24:38 $
> *
> *
> *
> @@ -250,10 +250,12 @@
>protected void checkHead(HttpResponseImpl response) {
>HttpServletRequest servletRequest =
>(HttpServletRequest) response.getRequest();
> -if (servletRequest.getMethod().equals("HEAD"))
> +if ((servletRequest.getMethod() != null)
> +&& (servletRequest.getMethod().equals("HEAD"))) {
>writeContent = false;
> -else
> +} else {
>writeContent = true;
> +}
>}
>
>
>
>
>
>
> --
> To unsubscribe, e-mail:
> For additional commands, e-mail:
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpResponseStream.java
remm02/02/20 11:24:38
Modified:catalina/src/share/org/apache/catalina/connector/http
HttpResponseStream.java
Log:
- Fix a NPE which could happen with an invalid request.
Revision ChangesPath
1.12 +7 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
Index: HttpResponseStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HttpResponseStream.java 27 Nov 2001 16:22:47 - 1.11
+++ HttpResponseStream.java 20 Feb 2002 19:24:38 - 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.11 2001/11/27 16:22:47 remm Exp $
- * $Revision: 1.11 $
- * $Date: 2001/11/27 16:22:47 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.12 2002/02/20 19:24:38 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/02/20 19:24:38 $
*
*
*
@@ -250,10 +250,12 @@
protected void checkHead(HttpResponseImpl response) {
HttpServletRequest servletRequest =
(HttpServletRequest) response.getRequest();
-if (servletRequest.getMethod().equals("HEAD"))
+if ((servletRequest.getMethod() != null)
+&& (servletRequest.getMethod().equals("HEAD"))) {
writeContent = false;
-else
+} else {
writeContent = true;
+}
}
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpResponseStream.java
remm01/11/27 13:35:39
Modified:catalina/src/share/org/apache/catalina/connector/http Tag:
tomcat_40_branch HttpResponseStream.java
Log:
- Port fix for bug 5126.
Revision ChangesPath
No revision
No revision
1.7.2.3 +30 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
Index: HttpResponseStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- HttpResponseStream.java 2001/11/03 02:24:18 1.7.2.2
+++ HttpResponseStream.java 2001/11/27 21:35:39 1.7.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.7.2.2 2001/11/03 02:24:18 remm Exp $
- * $Revision: 1.7.2.2 $
- * $Date: 2001/11/03 02:24:18 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.7.2.3 2001/11/27 21:35:39 remm Exp $
+ * $Revision: 1.7.2.3 $
+ * $Date: 2001/11/27 21:35:39 $
*
*
*
@@ -66,6 +66,7 @@
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.Response;
import org.apache.catalina.connector.ResponseStream;
@@ -100,6 +101,7 @@
super(response);
checkChunking(response);
+checkHead(response);
}
@@ -119,6 +121,12 @@
private boolean writingChunk;
+/**
+ * True if no content should be written.
+ */
+private boolean writeContent;
+
+
// ServletOutputStream Methods
@@ -135,6 +143,9 @@
if (suspended)
return;
+if (!writeContent)
+return;
+
if (useChunking && !writingChunk) {
writingChunk = true;
try {
@@ -160,6 +171,9 @@
if (suspended)
return;
+if (!writeContent)
+return;
+
if (useChunking && !writingChunk) {
if (len > 0) {
writingChunk = true;
@@ -188,6 +202,9 @@
throw new IOException
(sm.getString("responseStream.suspended"));
+if (!writeContent)
+return;
+
if (useChunking) {
// Write the final chunk.
writingChunk = true;
@@ -227,6 +244,16 @@
} else if (response.isChunkingAllowed()) {
response.removeHeader("Transfer-Encoding", "chunked");
}
+}
+
+
+protected void checkHead(HttpResponseImpl response) {
+HttpServletRequest servletRequest =
+(HttpServletRequest) response.getRequest();
+if (servletRequest.getMethod().equals("HEAD"))
+writeContent = false;
+else
+writeContent = true;
}
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpResponseStream.java
remm01/11/27 08:22:47
Modified:catalina/src/share/org/apache/catalina/connector/http
HttpResponseStream.java
Log:
- Add a generic mechanism to swallow the content when using HEAD.
Note: The problem was only present with error reports, as the default servlet
properly handled HEAD (it will continue to be that way, since it's obviously
more efficient).
Bugzilla: 5126
Revision ChangesPath
1.11 +30 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
Index: HttpResponseStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HttpResponseStream.java 2001/11/01 17:59:45 1.10
+++ HttpResponseStream.java 2001/11/27 16:22:47 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.10 2001/11/01 17:59:45 remm Exp $
- * $Revision: 1.10 $
- * $Date: 2001/11/01 17:59:45 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.11 2001/11/27 16:22:47 remm Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/11/27 16:22:47 $
*
*
*
@@ -66,6 +66,7 @@
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.Response;
import org.apache.catalina.connector.ResponseStream;
@@ -100,6 +101,7 @@
super(response);
checkChunking(response);
+checkHead(response);
}
@@ -119,6 +121,12 @@
private boolean writingChunk;
+/**
+ * True if no content should be written.
+ */
+private boolean writeContent;
+
+
// ServletOutputStream Methods
@@ -135,6 +143,9 @@
if (suspended)
return;
+if (!writeContent)
+return;
+
if (useChunking && !writingChunk) {
writingChunk = true;
try {
@@ -160,6 +171,9 @@
if (suspended)
return;
+if (!writeContent)
+return;
+
if (useChunking && !writingChunk) {
if (len > 0) {
writingChunk = true;
@@ -188,6 +202,9 @@
throw new IOException
(sm.getString("responseStream.suspended"));
+if (!writeContent)
+return;
+
if (useChunking) {
// Write the final chunk.
writingChunk = true;
@@ -227,6 +244,16 @@
} else if (response.isChunkingAllowed()) {
response.removeHeader("Transfer-Encoding", "chunked");
}
+}
+
+
+protected void checkHead(HttpResponseImpl response) {
+HttpServletRequest servletRequest =
+(HttpServletRequest) response.getRequest();
+if (servletRequest.getMethod().equals("HEAD"))
+writeContent = false;
+else
+writeContent = true;
}
--
To unsubscribe, e-mail:
For additional commands, e-mail:
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpResponseStream.java
remm01/10/04 12:26:29
Modified:catalina/src/share/org/apache/catalina/connector/http Tag:
tomcat_40_branch HttpResponseStream.java
Log:
- Merge a variety of fixes and small feature additions which have been made
and debugged in the HEAD branch, including:
- Removal of Jasper loader (merged with the shared loader).
- Fixes a lot of spec complaince issue regarding the commit state of the
response when using forwards, sendError or sendRedirect.
- Fixes cache consistency issues for static resource serving.
- Adds content caching for static resources (that's linked to the bugfix
mentioned just above).
- Merge enhanced error reporting and error page dispatching (which will be
able to display error pages for most errors returned from the pipeline -
like the 401 and 403 returned by the authenticator).
- Merge the fixes for all the other more recent bugfixes that have been
fixed in the HEAD branch.
- Passes all tester and Watchdog tests.
- Merge a variety of small enhancements to the build scripts which have been
made in the HEAD branch.
Revision ChangesPath
No revision
No revision
1.7.2.1 +38 -15
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
Index: HttpResponseStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- HttpResponseStream.java 2001/07/22 20:25:07 1.7
+++ HttpResponseStream.java 2001/10/04 19:26:29 1.7.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.7 2001/07/22 20:25:07 pier Exp $
- * $Revision: 1.7 $
- * $Date: 2001/07/22 20:25:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.7.2.1 2001/10/04 19:26:29 remm Exp $
+ * $Revision: 1.7.2.1 $
+ * $Date: 2001/10/04 19:26:29 $
*
*
*
@@ -131,15 +131,23 @@
*/
public void write(int b)
throws IOException {
+
+if (suspended)
+return;
+
if (useChunking && !writingChunk) {
writingChunk = true;
-print("1\r\n");
-super.write(b);
-println();
-writingChunk = false;
+try {
+print("1\r\n");
+super.write(b);
+println();
+} finally {
+writingChunk = false;
+}
} else {
super.write(b);
}
+
}
@@ -148,17 +156,25 @@
*/
public void write(byte[] b, int off, int len)
throws IOException {
+
+if (suspended)
+return;
+
if (useChunking && !writingChunk) {
if (len > 0) {
writingChunk = true;
-println(Integer.toHexString(len));
-super.write(b, off, len);
-println();
-writingChunk = false;
+try {
+println(Integer.toHexString(len));
+super.write(b, off, len);
+println();
+} finally {
+writingChunk = false;
+}
}
} else {
super.write(b, off, len);
}
+
}
@@ -168,11 +184,18 @@
*/
public void close() throws IOException {
+if (suspended)
+throw new IOException
+(sm.getString("responseStream.suspended"));
+
if (useChunking) {
// Write the final chunk.
writingChunk = true;
-print("0\r\n\r\n");
-writingChunk = false;
+try {
+print("0\r\n\r\n");
+} finally {
+writingChunk = false;
+}
}
super.close();
@@ -195,14 +218,14 @@
if (!response.isChunkingAllowed() && useChunking) {
// If we should chunk, but chunking is forbidden by the connector,
// we close the connection
-response.addHeader("Connection", "close");
+response.setHeader("Connection", "close");
} else {
response.removeHeader("Connection", "close");
}
// Don't chunk is the connection will be closed
useChunking = (useChunking && !response.isCloseCon
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpResponseStream.java
remm01/10/03 22:43:20
Modified:catalina/src/share/org/apache/catalina/connector/http
HttpResponseStream.java
Log:
- Use setHeader to avoid setting duplicate headers.
Revision ChangesPath
1.9 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
Index: HttpResponseStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HttpResponseStream.java 2001/09/28 23:34:02 1.8
+++ HttpResponseStream.java 2001/10/04 05:43:20 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.8 2001/09/28 23:34:02 remm Exp $
- * $Revision: 1.8 $
- * $Date: 2001/09/28 23:34:02 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.9 2001/10/04 05:43:20 remm Exp $
+ * $Revision: 1.9 $
+ * $Date: 2001/10/04 05:43:20 $
*
*
*
@@ -218,14 +218,14 @@
if (!response.isChunkingAllowed() && useChunking) {
// If we should chunk, but chunking is forbidden by the connector,
// we close the connection
-response.addHeader("Connection", "close");
+response.setHeader("Connection", "close");
} else {
response.removeHeader("Connection", "close");
}
// Don't chunk is the connection will be closed
useChunking = (useChunking && !response.isCloseConnection());
if (useChunking)
-response.addHeader("Transfer-Encoding", "chunked");
+response.setHeader("Transfer-Encoding", "chunked");
else
response.removeHeader("Transfer-Encoding", "chunked");
}
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http HttpResponseStream.java
remm01/03/14 11:18:20
Modified:catalina/src/share/org/apache/catalina/connector/http
HttpResponseStream.java
Log:
- An end chunk could be printed in the middle of a response if
write(byte[] b, int off, int len) was called with len = 0.
Revision ChangesPath
1.6 +10 -8
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java
Index: HttpResponseStream.java
===
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- HttpResponseStream.java 2001/03/08 23:55:36 1.5
+++ HttpResponseStream.java 2001/03/14 19:18:18 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.5 2001/03/08 23:55:36 remm Exp $
- * $Revision: 1.5 $
- * $Date: 2001/03/08 23:55:36 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpResponseStream.java,v
1.6 2001/03/14 19:18:18 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/03/14 19:18:18 $
*
*
*
@@ -149,11 +149,13 @@
public void write(byte[] b, int off, int len)
throws IOException {
if (useChunking && !writingChunk) {
-writingChunk = true;
-println(Integer.toHexString(len));
-super.write(b, off, len);
-println();
-writingChunk = false;
+if (len > 0) {
+writingChunk = true;
+println(Integer.toHexString(len));
+super.write(b, off, len);
+println();
+writingChunk = false;
+}
} else {
super.write(b, off, len);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
