summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-16 08:45:57 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-16 08:45:57 +0200
commit1e0e9e67f073a4414ac03599b4ff8994ff30bc05 (patch)
tree947238856e69d5b248b6928ae455a034705dedda /ChangeLog
parentcd118cfcc22ea283c8d0112aeedc3f0d8b42d8a8 (diff)
parent3ed4b2cd3ebaf6f4c377ba2e03ef52c2e8a985b6 (diff)
downloadrsyslog-1e0e9e67f073a4414ac03599b4ff8994ff30bc05.tar.gz
rsyslog-1e0e9e67f073a4414ac03599b4ff8994ff30bc05.tar.xz
rsyslog-1e0e9e67f073a4414ac03599b4ff8994ff30bc05.zip
Merge branch 'david-master' into master
Conflicts: ChangeLog runtime/msg.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7de6b470..a3fca075 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------
Version 5.3.2 [DEVEL] (rgerhards), 2009-10-??
+<<<<<<< HEAD:ChangeLog
- enhanced omfile to support transactional interface. This will increase
performance in many cases.
- added multi-ruleset support to imudp
@@ -21,6 +22,10 @@ Version 5.3.2 [DEVEL] (rgerhards), 2009-10-??
used together with the new interface. The removal also enables us to
drop a lot of duplicate code, reducing complexity and increasing
maintainability.
+- bugfix: potential segfault on messages with empty MSG part. This was a
+ recently introduced regression.
+- bugfix: debug string larger than 1K were improperly displayed. Max size
+ is now 32K, and if a string is even longer it is meaningful truncated.
---------------------------------------------------------------------------
Version 5.3.1 [DEVEL] (rgerhards), 2009-10-05
- added $AbortOnUncleanConfig directive - permits to prevent startup when