summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-06-16 18:02:13 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-06-16 18:02:13 +0200
commitb3dae5cff321e066bacc5e03846c77f832004006 (patch)
tree18cb6280dafbfe9abb8e37d8988b09ebc753af3e
parent257b06aac8222cdea231a95cbbe659679a2d417e (diff)
parent3135b3335d711c2638f1fedc867fb966008e2361 (diff)
downloadrsyslog-b3dae5cff321e066bacc5e03846c77f832004006.tar.gz
rsyslog-b3dae5cff321e066bacc5e03846c77f832004006.tar.xz
rsyslog-b3dae5cff321e066bacc5e03846c77f832004006.zip
Merge branch 'v4-stable' into v5-stable
-rw-r--r--ChangeLog6
-rw-r--r--runtime/datetime.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d7bf02a..4d1fe09f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -892,6 +892,9 @@ Version 4.6.6 [v4-stable] (rgerhards), 2010-11-??
discarded (due to QUEUE_FULL or similar problem)
- bugfix: a slightly more informative error message when a TCP
connections is aborted
+- bugfix: timestamp was incorrectly calculated for timezones with minute
+ offset
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
- some improvements thanks to clang's static code analyzer
o overall cleanup (mostly unnecessary writes and otherwise unused stuff)
o bugfix: fixed a very remote problem in msg.c which could occur when
@@ -1530,6 +1533,9 @@ version before switching to this one.
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
Version 3.22.4 [v3-stable] (rgerhards), 2010-??-??
+- bugfix: timestamp was incorrectly calculated for timezones with minute
+ offset
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271
- improved some code based on clang static analyzer results
---------------------------------------------------------------------------
Version 3.22.3 [v3-stable] (rgerhards), 2010-11-24
diff --git a/runtime/datetime.c b/runtime/datetime.c
index de26762d..f81180ea 100644
--- a/runtime/datetime.c
+++ b/runtime/datetime.c
@@ -122,7 +122,7 @@ static void getCurrTime(struct syslogTime *t, time_t *ttSeconds)
else
t->OffsetMode = '+';
t->OffsetHour = lBias / 3600;
- t->OffsetMinute = lBias % 3600;
+ t->OffsetMinute = (lBias % 3600) / 60;
t->timeType = TIME_TYPE_RFC5424; /* we have a high precision timestamp */
}