[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 8ea3d6bb566e5613b064202f2a7740c673ca5009
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 19 16:40:43 2004 +0000

            Reviewed by Ken.
    
            - fixed problem with methods like setUTCHour
    
            * kjs/date_object.cpp: (DateProtoFuncImp::call): Fix conversion back to time_t to use the appropriate
            GMT vs. local time function based on the utc flag.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6239 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b92d63b..df555da 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-19  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed problem with methods like setUTCHour
+
+        * kjs/date_object.cpp: (DateProtoFuncImp::call): Fix conversion back to time_t to use the appropriate
+        GMT vs. local time function based on the utc flag.
+
 2004-03-17  Richard Williamson   <rjw at apple.com>
 
 	Added a context parameter to result callbacks use by JavaScriptObject functions.  This was a change requested by Eric Carlson on the QT plugin team.
diff --git a/JavaScriptCore/kjs/date_object.cpp b/JavaScriptCore/kjs/date_object.cpp
index 1d254fe..9941195 100644
--- a/JavaScriptCore/kjs/date_object.cpp
+++ b/JavaScriptCore/kjs/date_object.cpp
@@ -560,7 +560,7 @@ Value DateProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &args)
   if (id == SetYear || id == SetMilliSeconds || id == SetSeconds ||
       id == SetMinutes || id == SetHours || id == SetDate ||
       id == SetMonth || id == SetFullYear ) {
-    time_t mktimeResult = mktime(t);
+    time_t mktimeResult = utc ? timegm(t) : mktime(t);
     if (mktimeResult == invalidDate)
       result = Number(NaN);
     else

-- 
WebKit Debian packaging