Next pass at the time functions. This defines an ap_ansi_time_t which has

a specific format (seconds since 0:00:00 Jan 1, 1970).  I also renamed the
(get|set)_curtime functions to (get|set)ansitime.  This should make more
sense, and be a bit more intuitive.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84400 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index c8026aaf0391b9b8824e283756049decba0125ff..224757e665e71b1fac96351920810f0ca36e7ebf 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1183,7 +1183,7 @@ static int handle_flastmod(ap_file_t *in, request_rec *r, const char *error, con
             parse_string(r, tag_val, parsed_string, sizeof(parsed_string), 0);
             if (!find_file(r, "flastmod", tag, parsed_string, &finfo, error)) {
                 ap_make_time(&mtime, r->pool);
-                ap_set_curtime(mtime, finfo.st_mtime);
+                ap_set_ansitime(mtime, finfo.st_mtime);
                 ap_rputs(ap_ht_time(r->pool, mtime, tf, 0), r);
             }
         }

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 2782a4e9c074b66282e6d6323b60ff95df15b1b3..df8bc7fabf972cc02abec9b648478528ef15fafa 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1162,7 +1162,7 @@ static struct ent *make_autoindex_entry(char *name, int autoindex_opts,
         request_rec *rr = ap_sub_req_lookup_file(name, r);
 
        if (rr->finfo.protection != 0) {
-           ap_get_curtime(rr->finfo.mtime, (ap_int64_t *)&p->lm);
+           ap_get_ansitime(rr->finfo.mtime, (ap_int64_t *)&p->lm);
            if (S_ISDIR(rr->finfo.protection)) {
                if (!(p->icon = find_icon(d, rr, 1))) {
                    p->icon = find_default_icon(d, "^^DIRECTORY^^");

diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c
index a92c237e354fb7d6fc912dbdc37595157be6fc12..9a48d9f3682f352ca4da4a1a9881884477277d0d 100644 (file)
--- a/modules/metadata/mod_expires.c
+++ b/modules/metadata/mod_expires.c
@@ -466,7 +466,7 @@ static int add_expires(request_rec *r)
         /* there's been some discussion and it's possible that 
          * 'access time' will be stored in request structure
          */
-        ap_get_curtime(r->request_time, &base);
+        ap_get_ansitime(r->request_time, &base);
         additional = atoi(&code[1]);
         break;
     default:
@@ -485,7 +485,7 @@ static int add_expires(request_rec *r)
                                  * under FreeBSD
                                  */
     ap_make_time(&finaltime, r->pool);
-    ap_set_curtime(finaltime, expires);
+    ap_set_ansitime(finaltime, expires);
     ap_timestr(&timestr, finaltime, APR_UTCTIME, r->pool); 
     ap_table_setn(r->headers_out, "Expires", timestr);
     return OK;

diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c
index 01fd4528db55f09ecc6a71aa51c6f316231b5965..620741680e5117fe34b438f8565db6b0f59d71b5 100644 (file)
--- a/modules/metadata/mod_usertrack.c
+++ b/modules/metadata/mod_usertrack.c
@@ -188,7 +188,7 @@ static void make_cookie(request_rec *r)
         ap_size_t retsize;
         
         ap_make_time(&when, r->pool);
-        ap_get_curtime(when, &req_time);
+        ap_get_ansitime(when, &req_time);
 #ifndef MILLENIAL_COOKIES
         /*
          * Only two-digit date string, so we can't trust "00" or more.
@@ -197,11 +197,11 @@ static void make_cookie(request_rec *r)
          */
 
         if (req_time + cls->expires > 946684799) {
-            ap_set_curtime(when, 946684799);
+            ap_set_ansitime(when, 946684799);
         }
         else
 #endif
-            ap_set_curtime(when,  req_time + cls->expires);
+            ap_set_ansitime(when,  req_time + cls->expires);
 
         /* Cookie with date; as strftime '%a, %d-%h-%y %H:%M:%S GMT' */
         ap_strftime(temp_cookie, &retsize, MAX_STRING_LEN, "%a, %d-%h-%y %H:%M:%S GMT", when);