[Fix] Date header timezone adjustments (#1279)

diff --git a/src/libutil/util.c b/src/libutil/util.c
index c33a92180f8220ec80b4aadeb40266d3a01fdb78..76325522c3cb309c4f17125acaeb8c0f6ba6bc80 100644 (file)
--- a/src/libutil/util.c
+++ b/src/libutil/util.c
@@ -2648,7 +2648,7 @@ rspamd_tm_to_time (const struct tm *tm, glong tz)
        result += tm->tm_sec;
 
        /* Now apply tz offset */
-       result -= offset;
+       result += offset;
 
        return result;
 }

diff --git a/src/ragel/smtp_date.rl b/src/ragel/smtp_date.rl
index 25e1ea3c09cb9228f087ddcb6affd64437ef7d83..6830506cdd712de5f4825a273f3144a81c7470e4 100644 (file)
--- a/src/ragel/smtp_date.rl
+++ b/src/ragel/smtp_date.rl
@@ -79,16 +79,16 @@
     }
   }
   action TZ_Sign {
-    tmp = p - 1;
+    tmp = p;
   }
   action TZ_Offset_Start {
 
   }
   action TZ_Offset_End {
     if (p > tmp + 1) {
-      rspamd_strtoul (tmp + 1, p - tmp - 1, (gulong *)&tz);
+      rspamd_strtoul (tmp + 1, p - tmp, (gulong *)&tz);
 
-      if (*tmp == '-') {
+      if (*(tmp - 1) == '-') {
         tz = -(tz);
       }
     }
@@ -189,6 +189,6 @@
                      "MST" %TZ_MST | "MDT" %TZ_MDT |
                      "PST" %TZ_PST | "PDT" %TZ_PDT |
                      [a-iA-I] | [k-zK-Z];
-  time            =   time_of_day %DT_End (zone | obs_zone %Obs_Zone_End);
+  time            =   time_of_day %DT_End (zone | obs_zone %Obs_Zone_End) FWS*;
   date_time       =   (day_of_week ",")? date time;
-}%%
\ No newline at end of file
+}%%