diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-25 14:33:27 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-25 14:33:27 +0100 |
commit | 89092a5e4a4ae2f162a3eb164125cf668ad10bfc (patch) | |
tree | b3a256699cd82d83562c07977a5b083a0f39a46b | |
parent | b3eaf151087723bef45c5196e7a0f806246e9b82 (diff) | |
parent | 76ded5e98bd51d5de306f21f8abd28ee3b006be2 (diff) | |
download | rsyslog-89092a5e4a4ae2f162a3eb164125cf668ad10bfc.tar.gz rsyslog-89092a5e4a4ae2f162a3eb164125cf668ad10bfc.tar.xz rsyslog-89092a5e4a4ae2f162a3eb164125cf668ad10bfc.zip |
Merge branch 'v4-stable' into tmp
Conflicts:
configure.ac
doc/manual.html
-rw-r--r-- | ChangeLog | 42 |
1 files changed, 31 insertions, 11 deletions
@@ -1,16 +1,12 @@ -- improved testbench to contain samples for totally malformed messages - which miss parts of the message content -- bugfix: some malformed messages could lead to a missing LF inside files - or some other missing parts of the template content. -- bugfix: if a message ended immediately with a hostname, the hostname - was mistakenly interpreted as TAG, and localhost be used as hostname -- bugfix: message without MSG part could case a segfault - [backported from v5 commit 98d1ed504ec001728955a5bcd7916f64cd85f39f] - This actually was a "recent" regression, but I did not realize that it - was introduced by the performance optimization in v4-devel. Shame on - me for having two devel versions at the same time... --------------------------------------------------------------------------- Version 5.5.3 [DEVEL] (rgerhards), 2010-02-?? +- imported patches from 4.6.0: + * improved testbench to contain samples for totally malformed messages + which miss parts of the message content + * bugfix: some malformed messages could lead to a missing LF inside files + or some other missing parts of the template content. + * bugfix: if a message ended immediately with a hostname, the hostname + was mistakenly interpreted as TAG, and localhost be used as hostname --------------------------------------------------------------------------- Version 5.5.2 [DEVEL] (rgerhards), 2010-02-05 - applied patches that make rsyslog compile under Apple OS X. @@ -400,6 +396,30 @@ Version 4.7.0 [v4-devel] (rgerhards), 2009-09-?? - bugfix: potential segfault when -p command line option was used Thanks for varmojfekoj for pointing me at this bug. --------------------------------------------------------------------------- +Version 4.6.1 [v4-stable] (rgerhards), 2010-02-?? +--------------------------------------------------------------------------- +Version 4.6.0 [v4-stable] (rgerhards), 2010-02-24 +*************************************************************************** +* This is a new stable v4 version. It contains all fixes and enhancements * +* made during the 4.5.x phase as well as those listed below. * +* Note: this version is scheduled to conclude the v4 development process. * +* Do not expect any more new developments in v4. The focus is now * +* on v5 (what also means we have a single devel branch again). * +* ("development" means new feature development, bug fixes are of * +* course provided for v4-stable) * +*************************************************************************** +- improved testbench to contain samples for totally malformed messages + which miss parts of the message content +- bugfix: some malformed messages could lead to a missing LF inside files + or some other missing parts of the template content. +- bugfix: if a message ended immediately with a hostname, the hostname + was mistakenly interpreted as TAG, and localhost be used as hostname +- bugfix: message without MSG part could case a segfault + [backported from v5 commit 98d1ed504ec001728955a5bcd7916f64cd85f39f] + This actually was a "recent" regression, but I did not realize that it + was introduced by the performance optimization in v4-devel. Shame on + me for having two devel versions at the same time... +--------------------------------------------------------------------------- Version 4.5.8 [v4-beta] (rgerhards), 2010-02-10 - enhanced doc for using PostgreSQL Thanks to Marc Schiffbauer for the new/updated doc |