merge with 1.9.4f

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/getdate.y b/lib/getdate.y
index 31e402b23..fd545d6ca 100644
--- 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);