summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-11-25 12:52:24 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-11-25 12:52:24 +0100
commited2a2fd829d36e87086be666b319ac4b17ded8c2 (patch)
treeea1a2514818499c73f8dd6f8f562593d5e645ccb
parentda8670d37a49ebda19dea708f716ad66a75f94e4 (diff)
parentd1846d8561fe5ecce13248b7b34333362d050c01 (diff)
downloadrsyslog-ed2a2fd829d36e87086be666b319ac4b17ded8c2.tar.gz
rsyslog-ed2a2fd829d36e87086be666b319ac4b17ded8c2.tar.xz
rsyslog-ed2a2fd829d36e87086be666b319ac4b17ded8c2.zip
Merge branch 'v4.4.2a' into v4-stable
Conflicts: ChangeLog configure.ac plugins/imfile/imfile.c runtime/stream.c
-rw-r--r--ChangeLog12
1 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d25cd76..fccc946b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,17 @@
---------------------------------------------------------------------------
-Version 4.6.5 [v4-stable] (rgerhards), 2010-11-24
-- bugfix(important): problem in TLS handling could cause rsyslog to loop
- in a tight loop, effectively disabling functionality and bearing the
- risk of unresponsiveness of the whole system.
- Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
+Version 4.6.6 [v4-stable] (rgerhards), 2010-11-??
- bugfix: a couple of problems that imfile had on some platforms, namely
Ubuntu (not their fault, but occured there)
- bugfix: imfile utilizes 32 bit to track offset. Most importantly,
this problem can not experienced on Fedora 64 bit OS (which has
64 bit long's!)
---------------------------------------------------------------------------
+Version 4.6.5 [v4-stable] (rgerhards), 2010-11-24
+- bugfix(important): problem in TLS handling could cause rsyslog to loop
+ in a tight loop, effectively disabling functionality and bearing the
+ risk of unresponsiveness of the whole system.
+ Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
+---------------------------------------------------------------------------
Version 4.6.4 [v4-stable] (rgerhards), 2010-08-05
- bugfix: zero-sized (empty) messages were processed by imtcp
they are now dropped as they always should have been