diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 14:10:52 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 14:10:52 +0200 |
commit | 28af40670e9dc1a85a24dfcbb093ddc1171e151f (patch) | |
tree | e3cd7ed2f7f1980aff5e49eff2aab18bfe7f7bbb | |
parent | fdc25fb14b6acc1484a59f55746bd4041e0103ff (diff) | |
parent | bcd956d4d500040808b920e468529da94a1e33c8 (diff) | |
download | rsyslog-28af40670e9dc1a85a24dfcbb093ddc1171e151f.tar.gz rsyslog-28af40670e9dc1a85a24dfcbb093ddc1171e151f.tar.xz rsyslog-28af40670e9dc1a85a24dfcbb093ddc1171e151f.zip |
Merge branch 'v4-stable' into v5-stable
Conflicts:
tcpsrv.c
-rw-r--r-- | ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -834,6 +834,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 |