From 01adeab0cba21ad6193addf1a4e90689b507d092 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 2 Apr 2009 14:41:32 +0200 Subject: preparing for 3.20.5 release --- ChangeLog | 4 ++-- configure.ac | 2 +- doc/manual.html | 2 +- runtime/wtp.c | 8 ++++++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a94eb24a..a4eb6151 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,9 @@ +--------------------------------------------------------------------------- +Version 3.20.5 [v3-stable] (rgerhards), 2009-04-02 - bugfix: potential abort with DA queue after high watermark is reached There exists a race condition that can lead to a segfault. Thanks go to vbernetr, who performed the analysis and provided patch, which I only tweaked a very little bit. ---------------------------------------------------------------------------- -Version 3.20.5 [v3-stable] (rgerhards), 2009-0?-?? - fixed bugs in RainerScript: o when converting a number and a string to a common type, both were actually converted to the other variable's type. diff --git a/configure.ac b/configure.ac index 6a79d9a3..e636070c 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[3.20.4],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[3.20.5],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([ChangeLog]) AC_CONFIG_HEADERS([config.h]) diff --git a/doc/manual.html b/doc/manual.html index e7db5768..c9fd9b90 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -16,7 +16,7 @@ relay chains while at the same time being very easy to setup for the novice user. And as we know what enterprise users really need, there is also professional rsyslog support available directly from the source!

-

This documentation is for version 3.20.4 (v3-stable branch) of rsyslog. +

This documentation is for version 3.20.5 (v3-stable branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might diff --git a/runtime/wtp.c b/runtime/wtp.c index fcefa1d8..3e3ff09a 100644 --- a/runtime/wtp.c +++ b/runtime/wtp.c @@ -196,6 +196,14 @@ wtpProcessThrdChanges(wtp_t *pThis) FINALIZE; } + /* Note: there is a left-over potential race condition below: + * pThis->bThrdStateChanged may be re-set by another thread while + * we work on it and thus the loop may terminate too early. However, + * there are no really bad effects from that so I perfer - for this + * version - to live with the problem as is. Not a good idea to + * introduce that large change into the stable branch without very + * good reason. -- rgerhards, 2009-04-02 + */ do { /* reset the change marker */ pThis->bThrdStateChanged = 0; -- cgit v1.2.3