ISO8601 high priority, before UNIX timestamp

Author: denji

ngx_http_hmac_secure_link_module.c

@@ -157,21 +157,12 @@ ngx_http_secure_link_variable(ngx_http_request_t *r,
                        "secure link timestamp: \"%*s\"",
                         sizeof("1970-09-28T12:00:00+06:00")-1, p);
 
-        /* Try if p is UNIX timestamp*/
-        if (sscanf((char *)p, "%llu", &conv_timestamp) == 1) {
-            timestamp = (time_t)conv_timestamp;
-
-            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
-                           "secure link timestamp: \"%T\"", timestamp);
-        } else {
-            /* Parse timestamp in ISO8601 format */
-            if (sscanf((char *)p, "%4d-%02d-%02dT%02d:%02d:%02d%c%02i:%02i",
-                                   (ngx_tm_year_t *) &year, (ngx_tm_mon_t *) &month,
-                                   (ngx_tm_mday_t *) &mday, (ngx_tm_hour_t *) &hour,
-                                   (ngx_tm_min_t *) &min, (ngx_tm_sec_t *) &sec,
-                                   &gmtoff_sign, &gmtoff_hour, &gmtoff_min) < 9) {
-                goto not_found;
-            }
+        /* Parse timestamp in ISO8601 format */
+        if (sscanf((char *)p, "%4d-%02d-%02dT%02d:%02d:%02d%c%02i:%02i",
+                              (ngx_tm_year_t *) &year, (ngx_tm_mon_t *) &month,
+                              (ngx_tm_mday_t *) &mday, (ngx_tm_hour_t *) &hour,
+                              (ngx_tm_min_t *) &min, (ngx_tm_sec_t *) &sec,
+                              &gmtoff_sign, &gmtoff_hour, &gmtoff_min) == 9) {
 
             /* Put February last because it has leap day */
             month -= 2;
@@ -208,6 +199,17 @@ ngx_http_secure_link_variable(ngx_http_request_t *r,
 
             ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                            "secure link timestamp: \"%T\"", timestamp);
+
+        } else if (sscanf((char *)p, "%llu", &conv_timestamp) == 1) {
+            /* Try if p is UNIX timestamp */
+
+            timestamp = (time_t)conv_timestamp;
+
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "secure link timestamp: \"%T\"", timestamp);
+
+        } else {
+          goto not_found;
         }
 
         if (timestamp <= 0) {