summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-01-26 12:02:07 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-01-26 12:02:07 +0100
commit939852b1cdfaed376342a3a0aa4b0fb7c14f55c5 (patch)
tree68553cc6c04318978807e83ff408922ac5d2b461
parent8a3a6f4deb76218f24e79380db30904eef1feded (diff)
parent7d098f14cba4f31dec7d92136183ebd0ccf7e1d0 (diff)
downloadrsyslog-939852b1cdfaed376342a3a0aa4b0fb7c14f55c5.tar.gz
rsyslog-939852b1cdfaed376342a3a0aa4b0fb7c14f55c5.tar.xz
rsyslog-939852b1cdfaed376342a3a0aa4b0fb7c14f55c5.zip
Merge branch 'v4-stable' into v4-beta
Conflicts: runtime/queue.c
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 26889c6d..35f92a29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -192,6 +192,8 @@ Version 4.4.3 [v4-stable] (rgerhards), 2009-10-??
This was a regression from the time() optimizations done in v4.
Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=143
Thanks to Klaus Tachtler for reporting this bug.
+- bugfix: potential segfault on queue shutdown
+ Thanks to varmojfekoj for the patch.
- bugfix: potential hang condition on queue shutdown
[imported from v3-stable]
- bugfix: segfault on startup when -q or -Q option was given