Merge branch 'v5-devel'

Conflicts:
	ChangeLog
	action.c
	plugins/imudp/imudp.c
	runtime/glbl.c

1 files changed, 46 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index fd7229f6..b607c485 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------
+Version 6.1.3  [DEVEL] (rgerhards), 2010-12-??
+- added $IMUDPSchedulingPolicy and $IMUDPSchedulingPriority config settings
+- added $LocalHostName config directive
+- bugfix: fixed build problems on some platforms
+  namely those that have 32bit atomic operations but not 64 bit ones
+- bugfix: local hostname was pulled too-early, so that some config 
+  directives (namely FQDN settings) did not have any effect
+---------------------------------------------------------------------------
 Version 6.1.2  [DEVEL] (rgerhards), 2010-12-16
 - added experimental support for log normalizaton (via liblognorm)
   support for normalizing log messages has been added in the form of
@@ -51,6 +59,14 @@ expected that interfaces, even new ones, break during the initial
   syslog plain tcp input plugin (NOT supporting TLS!)
   [ported from v4]
 ---------------------------------------------------------------------------
+Version 5.7.3  [V5-DEVEL] (rgerhards), 2010-12-??
+- added $IMUDPSchedulingPolicy and $IMUDPSchedulingPriority config settings
+- added $LocalHostName config directive
+- bugfix: fixed build problems on some platforms
+  namely those that have 32bit atomic operations but not 64 bit ones
+- bugfix: local hostname was pulled too-early, so that some config 
+  directives (namely FQDN settings) did not have any effect
+---------------------------------------------------------------------------
 Version 5.7.2  [V5-DEVEL] (rgerhards), 2010-11-26
 - bugfix(important): problem in TLS handling could cause rsyslog to loop
   in a tight loop, effectively disabling functionality and bearing the
@@ -96,7 +112,21 @@ Version 5.7.0  [V5-DEVEL] (rgerhards), 2010-09-16
     thanks to Lennart Poettering for this patch
   * sd-systemd API added as part of rsyslog runtime library
 ---------------------------------------------------------------------------
-Version 5.6.2  [V5-STABLE] (rgerhards), 2010-11-??
+Version 5.6.3  [V5-STABLE] (rgerhards), 2010-12-??
+- bugfix: action processor released mememory too early, resulting in
+  potential issue in retry cases (but very unlikely due to another
+  bug, which I also fixed -- only after the fix this problem here
+  became actually visible).
+- bugfix: batch processing flagged invalid message as "bad" under some
+  circumstances
+- bugfix: unitialized variable could cause issues under extreme conditions
+  plus some minor nits. This was found after a clang static code analyzer
+  analysis (great tool, and special thanks to Marcin for telling me about
+  it!)
+- bugfix: batches which had actions in error were not properly retried in
+  all cases
+---------------------------------------------------------------------------
+Version 5.6.2  [V5-STABLE] (rgerhards), 2010-11-30
 - bugfix: compile failed on systems without epoll_create1()
   Thanks to David Hill for providing a fix.
 - bugfix: atomic increment for msg object may not work correct on all
@@ -612,7 +642,7 @@ increase.
 - increased ompgsql performance by adapting to new transactional
   output module interface
 ---------------------------------------------------------------------------
-Version 4.7.3  [v4-devel] (rgerhards), 2010-??-??
+Version 4.7.3  [v4-devel] (rgerhards), 2010-11-25
 - added omuxsock, which permits to write message to local Unix sockets
   this is the counterpart to imuxsock, enabling fast local forwarding
 - added imptcp, a simplified, Linux-specific and potentielly fast
@@ -670,16 +700,22 @@ Version 4.7.0  [v4-devel] (rgerhards), 2010-04-14
   Thanks for varmojfekoj for pointing me at this bug.
 - imported changes from 4.5.6 and below
 ---------------------------------------------------------------------------
-Version 4.6.5  [v4-stable] (rgerhards), 2010-??-??
-- bugfix(important): problem in TLS handling could cause rsyslog to loop
-  in a tight loop, effectively disabling functionality and bearing the
-  risk of unresponsiveness of the whole system.
-  Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
+Version 4.6.6  [v4-stable] (rgerhards), 2010-11-??
 - bugfix: a couple of problems that imfile had on some platforms, namely
   Ubuntu (not their fault, but occured there)
 - bugfix: imfile utilizes 32 bit to track offset. Most importantly,
   this problem can not experienced on Fedora 64 bit OS (which has
   64 bit long's!)
+- some improvements thanks to clang's static code analyzer
+  o overall cleanup (mostly unnecessary writes and otherwise unused stuff)
+  o bugfix: fixed a very remote problem in msg.c which could occur when
+    running under extremely low memory conditions
+---------------------------------------------------------------------------
+Version 4.6.5  [v4-stable] (rgerhards), 2010-11-24
+- bugfix(important): problem in TLS handling could cause rsyslog to loop
+  in a tight loop, effectively disabling functionality and bearing the
+  risk of unresponsiveness of the whole system.
+  Bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=194
 ---------------------------------------------------------------------------
 Version 4.6.4  [v4-stable] (rgerhards), 2010-08-05
 - bugfix: zero-sized (empty) messages were processed by imtcp
@@ -1307,6 +1343,9 @@ version before switching to this one.
 - bugfix: memory leak in ompgsql
   Thanks to Ken for providing the patch
 ---------------------------------------------------------------------------
+Version 3.22.4 [v3-stable] (rgerhards), 2010-??-??
+- improved some code based on clang static analyzer results
+---------------------------------------------------------------------------
 Version 3.22.3 [v3-stable] (rgerhards), 2010-11-24
 - bugfix(important): problem in TLS handling could cause rsyslog to loop
   in a tight loop, effectively disabling functionality and bearing the