You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/11/11 00:37:26 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/util CookieTools.java
craigmcc 00/11/10 15:37:25
Modified: src/share/org/apache/tomcat/util Tag: tomcat_32
CookieTools.java
Log:
Correctly expire version zero cookies by setting a time far in the past.
Submitted by: Paul Frieden <pf...@dChain.com>
Revision Changes Path
No revision
No revision
1.7.2.2 +11 -6 jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/CookieTools.java
Index: CookieTools.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/CookieTools.java,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- CookieTools.java 2000/07/03 09:49:11 1.7.2.1
+++ CookieTools.java 2000/11/10 23:37:25 1.7.2.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/CookieTools.java,v 1.7.2.1 2000/07/03 09:49:11 bergsten Exp $
- * $Revision: 1.7.2.1 $
- * $Date: 2000/07/03 09:49:11 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/util/Attic/CookieTools.java,v 1.7.2.2 2000/11/10 23:37:25 craigmcc Exp $
+ * $Revision: 1.7.2.2 $
+ * $Date: 2000/11/10 23:37:25 $
*
* ====================================================================
*
@@ -134,9 +134,14 @@
if (cookie.getMaxAge() >= 0) {
if (version == 0) {
buf.append (";Expires=");
- DateTool.oldCookieFormat.format(new Date( System.currentTimeMillis() + cookie.getMaxAge() *1000L) ,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());