--- jakarta-tomcat/src/share/org/apache/tomcat/util/CookieTools.java-old	Fri Nov 10 11:13:22 2000
+++ jakarta-tomcat/src/share/org/apache/tomcat/util/CookieTools.java	Fri Nov 10 11:13:46 2000
@@ -134,9 +134,13 @@
 	if (cookie.getMaxAge() >= 0) {
 	    if (version == 0) {
 		buf.append (";Expires=");
-		DateTool.oldCookieFormat.format(new Date( System.currentTimeMillis() + cookie.getMaxAge() *1000L) ,buf,
+		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());