remm 01/01/14 21:51:27
Modified: catalina/src/share/org/apache/catalina/servlets
DefaultServlet.java
Log:
- Fix a bug where a directory browse page wouldn't be served if the request
included a rage header. That fixes compatibility with the HTTP browser
included with the GetRight download manager.
Revision Changes Path
1.23 +15 -12
jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java
Index: DefaultServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DefaultServlet.java 2001/01/14 02:36:52 1.22
+++ DefaultServlet.java 2001/01/15 05:51:26 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.22 2001/01/14 02:36:52 remm Exp $
- * $Revision: 1.22 $
- * $Date: 2001/01/14 02:36:52 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.1/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.23 2001/01/15 05:51:26 remm Exp $
+ * $Revision: 1.23 $
+ * $Date: 2001/01/15 05:51:26 $
*
* ====================================================================
*
@@ -118,7 +118,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.22 $ $Date: 2001/01/14 02:36:52 $
+ * @version $Revision: 1.23 $ $Date: 2001/01/15 05:51:26 $
*/
public class DefaultServlet
@@ -1465,18 +1465,20 @@
// Parse range specifier
Vector ranges = null;
if (!resourceInfo.collection) {
+
ranges = parseRange(request, response, resourceInfo);
-
- // Last-Modified header
- if (debug > 0)
- log("DefaultServlet.serveFile: lastModified='" +
- (new Timestamp(resourceInfo.date)).toString() + "'");
- response.setDateHeader("Last-Modified", resourceInfo.date);
// ETag header
response.setHeader("ETag", getETag(resourceInfo, true));
+
}
+ // Last-Modified header
+ if (debug > 0)
+ log("DefaultServlet.serveFile: lastModified='" +
+ (new Timestamp(resourceInfo.date)).toString() + "'");
+ response.setDateHeader("Last-Modified", resourceInfo.date);
+
ServletOutputStream ostream = null;
PrintWriter writer = null;
@@ -1499,8 +1501,9 @@
}
- if ( ((ranges == null) || (ranges.isEmpty()))
- && (request.getHeader("Range") == null) ) {
+ if ( (resourceInfo.collection) ||
+ ( ((ranges == null) || (ranges.isEmpty()))
+ && (request.getHeader("Range") == null) ) ) {
// Set the appropriate output headers
if (contentType != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
