craigmcc 00/11/10 15:38:01
Modified: catalina/src/share/org/apache/catalina/util CookieTools.java
Log:
Correctly expire version zero cookies by setting a time well in the past.
Submitted by: Paul Frieden <[EMAIL PROTECTED]>
Revision Changes Path
1.2 +10 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java
Index: CookieTools.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CookieTools.java 2000/08/11 17:01:50 1.1
+++ CookieTools.java 2000/11/10 23:38:00 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java,v
1.1 2000/08/11 17:01:50 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/11 17:01:50 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/util/CookieTools.java,v
1.2 2000/11/10 23:38:00 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/11/10 23:38:00 $
*
* ====================================================================
*
@@ -134,9 +134,14 @@
if (cookie.getMaxAge() >= 0) {
if (version == 0) {
buf.append (";Expires=");
- DateTool.oldCookieFormat.format(new Date( System.currentTimeMillis() +
cookie.getMaxAge() *1000) ,buf,
- new FieldPosition(0));
-
+ if (cookie.getMaxAge() == 0)
+ DateTool.oldCookieFormat.format(new Date(10000), buf,
+ new FieldPosition(0));
+ else
+ DateTool.oldCookieFormat.format
+ (new Date( System.currentTimeMillis() +
+ cookie.getMaxAge() *1000L), buf,
+ new FieldPosition(0));
} else {
buf.append (";Max-Age=");
buf.append (cookie.getMaxAge());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
