summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-21 12:14:27 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-21 12:14:27 +0200
commitd251f02a8aa9b6f5f3c7e0193ff0b285ef614c75 (patch)
tree5992b20aae167e0e04cbf9f9d2523fe969d63fab
parentb60420c67c5d9a797c8cf0d20c7bc58eb93c0abe (diff)
parent38e83becf605f128ebae26fd58c68c2ef38e946a (diff)
downloadrsyslog-d251f02a8aa9b6f5f3c7e0193ff0b285ef614c75.tar.gz
rsyslog-d251f02a8aa9b6f5f3c7e0193ff0b285ef614c75.tar.xz
rsyslog-d251f02a8aa9b6f5f3c7e0193ff0b285ef614c75.zip
Merge branch 'v4-devel'
Conflicts: runtime/wtp.c
-rw-r--r--ChangeLog9
1 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 38dc2429..bba3484b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -225,7 +225,7 @@ Version 4.5.6 [v4-beta] (rgerhards), 2009-09-??
* bugfix: random data could be appended to message
* bugfix: reverse lookup reduction logic in imudp do DNS queries too often
---------------------------------------------------------------------------
-Version 4.5.5 [v4-beta] (rgerhards), 2009-09-??
+Version 4.5.5 [v4-beta] (rgerhards), 2009-10-21
- added $InputTCPServerNotifyOnConnectionClose config directive
see doc for details
- bugfix: debug string larger than 1K were improperly displayed. Max size
@@ -364,7 +364,11 @@ Version 4.5.0 [DEVEL] (rgerhards), 2009-07-02
This could lead to timestamps written in the wrong format, but not to
an abort
---------------------------------------------------------------------------
-Version 4.4.2 [v4-stable] (rgerhards), 2009-09-??
+Version 4.4.3 [v4-stable] (rgerhards), 2009-10-??
+- bugfix: potential hang condition on queue shutdown
+ [imported from v3-stable]
+---------------------------------------------------------------------------
+Version 4.4.2 [v4-stable] (rgerhards), 2009-10-09
- bugfix: invalid handling of zero-sized messages, could lead to mis-
addressing and potential memory corruption/segfault
- bugfix: zero-sized UDP messages are no longer processed
@@ -618,6 +622,7 @@ Version 3.22.2 [v3-stable] (rgerhards), 2009-07-??
- enhance: imrelp now also provides remote peer's IP address
[if librelp != 1.0.0 is used]
- bugfix: sending syslog messages with zip compression did not work
+- bugfix: potential hang condition on queue shutdown
- clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers]
in doc set (require TLS drivers)
---------------------------------------------------------------------------