summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--action.c2
-rw-r--r--configure.ac2
-rw-r--r--doc/manual.html2
-rw-r--r--tests/testsuites/imfile-basic.conf1
5 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fb55044f..855534d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
---------------------------------------------------------------------------
-Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-03-??
+Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08
- imfile: added $InputFileMaxLinesAtOnce directive
- enhanced imfile to support input batching
- added capability for imtcp and imptcp to activate keep-alive packets
diff --git a/action.c b/action.c
index 6a8bd2a3..b4762379 100644
--- a/action.c
+++ b/action.c
@@ -293,7 +293,7 @@ actionConstructFinalize(action_t *pThis)
if(pThis->pszName == NULL) {
snprintf((char*) pszQName, sizeof(pszQName)/sizeof(uchar), "action %d queue", iActionNbr);
} else {
- strncpy(pszQName, pThis->pszName, sizeof(pszQName));
+ ustrncpy(pszQName, pThis->pszName, sizeof(pszQName));
pszQName[63] = '\0'; /* to be on the save side */
}
diff --git a/configure.ac b/configure.ac
index 1faaff89..49d8f2fa 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],[5.8.1],[rsyslog@lists.adiscon.com])
+AC_INIT([rsyslog],[5.9.0],[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 5c656752..f6ae3000 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 5.8.1 (stable branch) of rsyslog.</b>
+<p><b>This documentation is for version 5.9.0 (stable 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
diff --git a/tests/testsuites/imfile-basic.conf b/tests/testsuites/imfile-basic.conf
index 9fb9b5ca..59b109a6 100644
--- a/tests/testsuites/imfile-basic.conf
+++ b/tests/testsuites/imfile-basic.conf
@@ -6,6 +6,7 @@ $InputFileTag file:
$InputFileStateFile stat-file1
$InputFileSeverity error
$InputFileFacility local7
+$InputFileMaxLinesAtOnce 100000
$InputRunFileMonitor
$template outfmt,"%msg:F,58:2%\n"