Changeset c7670f for server/src/http/ngx_http_parse_time.c

Timestamp:

10/30/09 18:13:41 (3 years ago)

Author:

George Potapov <nephrite@…>

Branches:

nginx-v0.8

Parents:

178a98

git-author:

George Potapov <nephrite@…> (10/30/09 18:13:41)

git-committer:

George Potapov <nephrite@…> (10/30/09 18:13:41)

Message:

Vendor drop nginx v0.8.21

File:

• server/src/http/ngx_http_parse_time.c (modified) (4 diffs)

server/src/http/ngx_http_parse_time.c

@@ -9 +9 @@
 
 
-static int mday[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+static ngx_uint_t  mday[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
 
 time_t
 ngx_http_parse_time(u_char *value, size_t len)
 {
-    u_char  *p, *end;
-    int      day, month, year, hour, min, sec;
+    u_char      *p, *end;
+    ngx_int_t    month;
+    ngx_uint_t   day, year, hour, min, sec;
+    uint64_t     time;
     enum {
         no = 0,
@@ -230 +232 @@
     }
 
-#if (NGX_TIME_T_SIZE <= 4)
-
-    if (year >= 2038) {
-        return NGX_ERROR;
-    }
-
-#endif
-
     /*
      * shift new year to March 1 and start months from 1 (not 0),
@@ -250 +244 @@
     /* Gauss' formula for Grigorian days since March 1, 1 BC */
 
-    return (
+    time = (uint64_t) (
             /* days in years including leap years since March 1, 1 BC */
 
@@ -269 +263 @@
 
             - 719527 + 31 + 28) * 86400 + hour * 3600 + min * 60 + sec;
+
+#if (NGX_TIME_T_SIZE <= 4)
+
+    if (time > 0x7fffffff) {
+        return NGX_ERROR;
+    }
+
+#endif
+
+    return (time_t) time;
 }