merge with 1.9.4f

diff --git a/lib/getdate.y b/lib/getdate.y
index 31e402b23cf37ea3b9152dbaaf603fa8dc113a05..fd545d6ca09b34d48f5907863e99c9a6e54c6918 100644 (file)
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -904,8 +904,14 @@ get_date(p, now)
 
        if (! (tm = gmtime (&ftz.time)))
            return -1;
-       gmt = *tm;      /* Make a copy, in case localtime modifies *tm.  */
-       ftz.timezone = difftm (&gmt, localtime (&ftz.time)) / 60;
+       gmt = *tm;
+
+       if (! (tm = localtime (&ftz.time)))
+           return -1;
+       
+       ftz.timezone = difftm (&gmt, tm) / 60;
+       if(tm->tm_isdst)
+           ftz.timezone += 60;
     }
 
     tm = localtime(&now->time);