Changeset 10932 in webkit for trunk/JavaScriptCore/kjs/date_object.cpp

Timestamp:

Oct 24, 2005, 1:45:59 PM (20 years ago)

Author:

sullivan

Message:

Reviewed by Darin Adler. Code changes by George Staikos/Geoff Garen.

• fixed ​http://bugzilla.opendarwin.org/show_bug.cgi?id=4142 Date object does not always adjust daylight savings correctly

• kjs/date_object.cpp: (KJS::makeTime): Fix the case where a time change crosses the daylight savings start/end dates.

File:

• trunk/JavaScriptCore/kjs/date_object.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/date_object.cpp

@@ -885 +885 @@
     }
 
+    // Determine whether DST is in effect. mktime() can't do this for us because
+    // it doesn't know about ms and yearOffset.
+    // NOTE: Casting values of large magnitude to time_t (long) will 
+    // produce incorrect results, but there's no other option when calling localtime_r().
+    if (!utc) { 
+        time_t tval = mktime(t) + (time_t)((ms + yearOffset) / 1000);  
+        struct tm t3;  
+        localtime_r(&tval, &t3);  
+        t->tm_isdst = t3.tm_isdst;  
+    }
+
     return (mktime(t) + utcOffset) * msPerSecond + ms + yearOffset;
 }