summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-06-14 15:09:41 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-06-14 15:09:41 +0200
commitfee33477845949c2f03000044b2dbc31382b48f1 (patch)
treed8ed2472205504b72273b088486f01d42d4c98de /ChangeLog
parent7f0c927623b6425fee2c39b2d5207d7c36e32acd (diff)
parent28af40670e9dc1a85a24dfcbb093ddc1171e151f (diff)
downloadrsyslog-fee33477845949c2f03000044b2dbc31382b48f1.tar.gz
rsyslog-fee33477845949c2f03000044b2dbc31382b48f1.tar.xz
rsyslog-fee33477845949c2f03000044b2dbc31382b48f1.zip
Merge branch 'v5-stable' into beta
Conflicts: ChangeLog runtime/nsd_gtls.c tcpsrv.c tests/Makefile.am
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog11
1 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 46a41574..d34ab025 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
---------------------------------------------------------------------------
Version 6.1.9 [BETA] (rgerhards), 2011-0?-??
+- bugfix: memory leak in imtcp & subsystems under some circumstances
+ This leak is tied to error conditions which lead to incorrect cleanup
+ of some data structures. [backport from v6].3
- bugfix: $ActionFileDefaultTemplate did not work
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=262
---------------------------------------------------------------------------
@@ -178,6 +181,11 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-??
affected directive was: $ActionExecOnlyWhenPreviousIsSuspended on
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236
---------------------------------------------------------------------------
+Version 5.8.2 [V5-stable] (rgerhards), 2011-06-??
+- bugfix: memory leak in imtcp & subsystems under some circumstances
+ This leak is tied to error conditions which lead to incorrect cleanup
+ of some data structures. [backport from v6]
+---------------------------------------------------------------------------
Version 5.8.1 [V5-stable] (rgerhards), 2011-05-19
- bugfix: invalid processing in QUEUE_FULL condition
If the the multi-submit interface was used and a QUEUE_FULL condition
@@ -1009,6 +1017,9 @@ Version 4.7.0 [v4-devel] (rgerhards), 2010-04-14
- imported changes from 4.5.6 and below
---------------------------------------------------------------------------
Version 4.6.6 [v4-stable] (rgerhards), 2010-11-??
+- bugfix: memory leak in imtcp & subsystems under some circumstances
+ This leak is tied to error conditions which lead to incorrect cleanup
+ of some data structures. [backport from v6, limited testing under v4]
- bugfix: invalid processing in QUEUE_FULL condition
If the the multi-submit interface was used and a QUEUE_FULL condition
occured, the failed message was properly destructed. However, the