Changeset 1478

Timestamp:

12/19/2006 03:11:04 PM (20 months ago)

Author:

glen

Message:

added now and weeks support to mod_expire. close #943

Files:

• branches/lighttpd-1.4.x/src/mod_expire.c (modified) (5 diffs)

branches/lighttpd-1.4.x/src/mod_expire.c

@@ -86 +86 @@
          * parse
          *
-         * '(access|modification) [plus] {<num> <type>}*'
+         * '(access|now|modification) [plus] {<num> <type>}*'
          *
          * e.g. 'access 1 years'
@@ -102 +102 @@
                 type  = 0;
                 ts   += 7;
+        } else if (0 == strncmp(ts, "now ", 4)) {
+                type  = 0;
+                ts   += 4;
         } else if (0 == strncmp(ts, "modification ", 13)) {
                 type  = 1;
@@ -117 +120 @@
         }
 
-        /* the rest is just <number> (years|months|days|hours|minutes|seconds) */
+        /* the rest is just <number> (years|months|weeks|days|hours|minutes|seconds) */
         while (1) {
                 char *space, *err;
@@ -149 +152 @@
                                    0 == strncmp(ts, "months", slen)) {
                                 num *= 60 * 60 * 24 * 30;
+                        } else if (slen == 5 &&
+                                   0 == strncmp(ts, "weeks", slen)) {
+                                num *= 60 * 60 * 24 * 7;
                         } else if (slen == 4 &&
                                    0 == strncmp(ts, "days", slen)) {
@@ -175 +181 @@
                         } else if (0 == strcmp(ts, "months")) {
                                 num *= 60 * 60 * 24 * 30;
+                        } else if (0 == strcmp(ts, "weeks")) {
+                                num *= 60 * 60 * 24 * 7;
                         } else if (0 == strcmp(ts, "days")) {
                                 num *= 60 * 60 * 24;