summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-06-04 11:18:27 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-06-04 11:18:27 +0200
commit325884b03d6c0a5883c92b1bbc2ae2dd2be1ef47 (patch)
tree719bd28d57ebfbe803cad0a559a4452f736678ae
parent27f1f720fadade9f3ba3211647579e70a7a835e4 (diff)
downloadrsyslog-325884b03d6c0a5883c92b1bbc2ae2dd2be1ef47.tar.gz
rsyslog-325884b03d6c0a5883c92b1bbc2ae2dd2be1ef47.tar.xz
rsyslog-325884b03d6c0a5883c92b1bbc2ae2dd2be1ef47.zip
preparing for 6.3.10
-rw-r--r--ChangeLog12
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
3 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d6bdd9f..57f3fab4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
---------------------------------------------------------------------------
-Version 6.3.10 [BETA] 2012-0?-??
+Version 6.3.10 [BETA] 2012-06-04
+- bugfix: delayble source could block action queue, even if there was
+ a disk queue associated with it. The root cause of this problem was
+ that it makes no sense to delay messages once they arrive in the
+ action queue - the "input" that is being held in that case is the main
+ queue worker, what makes no sense.
+ Thanks to Marcin for alerting us on this problem and providing
+ instructions to reproduce it.
- bugfix: invalid free in imptcp could lead to abort during startup
- bugfix: if debug message could end up in log file when forking
if rsyslog was set to auto-background (thus fork, the default) and debug
@@ -9,6 +16,9 @@ Version 6.3.10 [BETA] 2012-0?-??
in behaviour, which is under review. If it causes problems to you,
please let us know.
Thanks to Tomas Heinrich for the patch.
+- bugfix: --enable-smcustbindcdr configure directive did not work
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=330
+ Thanks to Ultrabug for the patch.
---------------------------------------------------------------------------
Version 6.3.9 [BETA] 2012-05-22
- bugfix: imtcp could cause hang during reception
diff --git a/configure.ac b/configure.ac
index 4109b9a8..a35182fa 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],[6.3.9],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[6.3.10],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff --git a/doc/manual.html b/doc/manual.html
index c9021e52..7af5c5eb 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -19,7 +19,7 @@ rsyslog support</a> available directly from the source!</p>
<p><b>Please visit the <a href="http://www.rsyslog.com/sponsors">rsyslog sponsor's page</a>
to honor the project sponsors or become one yourself!</b> We are very grateful for any help towards the
project goals.</p>
-<p><b>This documentation is for version 6.3.9 (beta branch) of rsyslog.</b>
+<p><b>This documentation is for version 6.3.10 (beta branch) of rsyslog.</b>
Visit the <i><a href="http://www.rsyslog.com/status">rsyslog status page</a></i></b>
to obtain current version information and project status.
</p><p><b>If you like rsyslog, you might