remm 01/10/04 12:28:57
Modified: catalina/src/share/org/apache/catalina/servlets Tag:
tomcat_40_branch DefaultServlet.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 Changes Path
No revision
No revision
1.39.2.1 +5 -5
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.39
retrieving revision 1.39.2.1
diff -u -r1.39 -r1.39.2.1
--- DefaultServlet.java 2001/09/12 16:19:25 1.39
+++ DefaultServlet.java 2001/10/04 19:28:56 1.39.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.39 2001/09/12 16:19:25 remm Exp $
- * $Revision: 1.39 $
- * $Date: 2001/09/12 16:19:25 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/DefaultServlet.java,v
1.39.2.1 2001/10/04 19:28:56 remm Exp $
+ * $Revision: 1.39.2.1 $
+ * $Date: 2001/10/04 19:28:56 $
*
* ====================================================================
*
@@ -122,7 +122,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.39 $ $Date: 2001/09/12 16:19:25 $
+ * @version $Revision: 1.39.2.1 $ $Date: 2001/10/04 19:28:56 $
*/
public class DefaultServlet
@@ -2175,7 +2175,7 @@
Date tempDate = tempAttrs.getCreationDate();
if (tempDate != null)
creationDate = tempDate.getTime();
- tempDate = tempAttrs.getLastModified();
+ tempDate = tempAttrs.getLastModifiedDate();
if (tempDate != null) {
date = tempDate.getTime();
httpDate = formats[0].format(tempDate);
