Index: mod_usertrack.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_usertrack.c,v
retrieving revision 1.51
diff -u -r1.51 mod_usertrack.c
--- mod_usertrack.c	2001/08/29 12:08:33	1.51
+++ mod_usertrack.c	2001/10/02 17:12:59
@@ -121,11 +121,6 @@
     char *cookie_domain;
 } cookie_dir_rec;
 
-/* Define this to allow post-2000 cookies. Cookies use two-digit dates,
- * so it might be dicey. (Netscape does it correctly, but others may not)
- */
-#define MILLENIAL_COOKIES
-
 /* Make Cookie: Now we have to generate something that is going to be
  * pretty unique.  We can base it on the pid, time, hostip */
 
@@ -188,30 +183,14 @@
 #endif
 
     if (cls->expires) {
-        struct tm *tms;
-        time_t when;
-
-        when = cls->expires;
-        if ((dcfg->style == CT_UNSET) || (dcfg->style == CT_NETSCAPE)) {
-            when += r->request_time;
-
-#ifndef MILLENIAL_COOKIES
-        /*
-         * Only two-digit date string, so we can't trust "00" or more.
-         * Therefore, we knock it all back to just before midnight on
-         * 1/1/2000 (which is 946684799)
-         */
 
-        if (when > 946684799)
-            when = 946684799;
-#endif
-        }
-        tms = gmtime(&when);
-
         /* Cookie with date; as strftime '%a, %d-%h-%y %H:%M:%S GMT' */
         new_cookie = ap_psprintf(r->pool, "%s=%s; path=/",
                                  dcfg->cookie_name, cookiebuf);
+
         if ((dcfg->style == CT_UNSET) || (dcfg->style == CT_NETSCAPE)) {
+            time_t when = cls->expires + r->request_time;
+            struct tm *tms = gmtime(&when);
             new_cookie = ap_psprintf(r->pool, "%s; "
                                      "expires=%s, %.2d-%s-%.2d "
                                      "%.2d:%.2d:%.2d GMT",
@@ -224,7 +203,7 @@
         }
         else {
             new_cookie = ap_psprintf(r->pool, "%s; max-age=%d",
-                                     new_cookie, (int) when);
+                                     new_cookie, cls->expires);
         }
     }
     else {