You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@locus.apache.org on 2000/09/25 09:16:02 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets DefaultServlet.java
remm 00/09/25 00:16:01
Modified: catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
- Range handling code should be more robust
Revision Changes Path
1.6 +8 -7 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultServlet.java 2000/08/24 23:57:03 1.5
+++ DefaultServlet.java 2000/09/25 07:16:01 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v 1.5 2000/08/24 23:57:03 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2000/08/24 23:57:03 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v 1.6 2000/09/25 07:16:01 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/09/25 07:16:01 $
*
* ====================================================================
*
@@ -109,7 +109,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.5 $ $Date: 2000/08/24 23:57:03 $
+ * @version $Revision: 1.6 $ $Date: 2000/09/25 07:16:01 $
*/
public class DefaultServlet
@@ -1024,7 +1024,7 @@
// Parse range specifier
Vector ranges = null;
if (!resourceInfo.collection) {
- parseRange(request, response, resourceInfo);
+ ranges = parseRange(request, response, resourceInfo);
// Last-Modified header
if (debug > 0)
@@ -1036,7 +1036,8 @@
response.setHeader("ETag", getETag(resourceInfo, true));
}
- if ( (ranges == null) && (request.getHeader("Range") == null) ) {
+ if ( ((ranges == null) || (ranges.isEmpty()))
+ && (request.getHeader("Range") == null) ) {
// Set the appropriate output headers
if (contentType != null) {
@@ -1061,7 +1062,7 @@
} else {
- if (ranges == null)
+ if ((ranges == null) || (ranges.isEmpty()))
return;
// Partial content response.