diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | action.c | 1 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | doc/manual.html | 2 | ||||
| -rw-r--r-- | doc/status.html | 70 | ||||
| -rw-r--r-- | runtime/conf.c | 2 | ||||
| -rw-r--r-- | tcps_sess.c | 11 |
7 files changed, 26 insertions, 79 deletions
@@ -39,6 +39,8 @@ Version 5.5.6 [DEVEL] (rgerhards), 2010-07-21 This, in default mode, caused buffered writing to be used, what means that it looked like no output were written or partial lines. Thanks to Michael Biebl for pointing out this bug. +- bugfix: programname filter in ! configuration can not be reset + Thanks to Kiss Gabor for the patch. --------------------------------------------------------------------------- Version 5.5.5 [DEVEL] (rgerhards), 2010-05-20 - added new cancel-reduced action thread termination method @@ -485,6 +487,8 @@ Version 4.7.2 [v4-devel] (rgerhards), 2010-05-03 whole atomic operation emulation has been rewritten. - added new $Sleep directive to hold processing for a couple of seconds during startup +- bugfix: programname filter in ! configuration can not be reset + Thanks to Kiss Gabor for the patch. --------------------------------------------------------------------------- Version 4.7.1 [v4-devel] (rgerhards), 2010-04-22 - Solaris support much improved -- was not truely usable in 4.7.0 @@ -520,10 +524,13 @@ 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.3 [v4-stable] (rgerhards), 2010-03-?? -- bugfix: potential segfaults during queue shutdown - (bugs require certain non-standard settings to appear) - Thanks to varmojfekoj for the patch [imported from 4.5.8] +Version 4.6.4 [v4-stable] (rgerhards), 2010-??-?? +- bugfix: zero-sized (empty) messages were processed by imtcp + they are now dropped as they always should have been +- bugfix: programname filter in ! configuration can not be reset + Thanks to Kiss Gabor for the patch. +--------------------------------------------------------------------------- +Version 4.6.3 [v4-stable] (rgerhards), 2010-07-07 - improvded testbench - added test with truly random data received via syslog to test robustness @@ -1160,6 +1167,8 @@ Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? was random (but most often "on") - bugfix: potential segfault when -p command line option was used thanks to varmojfekoj for pointing me at this bug +- bugfix: programname filter in ! configuration can not be reset + Thanks to Kiss Gabor for the patch. --------------------------------------------------------------------------- Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02 - bugfix: invalid error message issued if $inlcudeConfig was on an empty @@ -514,6 +514,7 @@ static rsRetVal actionDoRetry(action_t *pThis, time_t ttNow) iRet = pThis->pMod->tryResume(pThis->pModData); if((pThis->iResumeOKinRow > 999) && (pThis->iResumeOKinRow % 1000 == 0)) { bTreatOKasSusp = 1; + pThis->iResumeOKinRow = 0; } else { bTreatOKasSusp = 0; } diff --git a/doc/index.html b/doc/index.html index b3b336a7..d753e2ed 100644 --- a/doc/index.html +++ b/doc/index.html @@ -13,7 +13,7 @@ installed documentation which exactly matches the version you have installed. It is highly suggested to at least briefly look over these files. <li>The <a href="http://www.rsyslog.com">rsyslog web site</a> which offers probably every information you'll ever need (ok, just kidding...). -<li>The <a href="http://www.rsyslog.com/doc-status.html">project status page</a> provides +<li>The <a href="http://www.rsyslog.com/status">project status page</a> provides information on current releases <li>and the <a href="troubleshoot.html">troubleshooting guide</a> hopefully helps if things do not immediately work out diff --git a/doc/manual.html b/doc/manual.html index ca93addc..62f6103d 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -20,7 +20,7 @@ rsyslog support</a> available directly from the source!</p> 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.1.0 (devel branch) of rsyslog.</b> -Visit the <i><a href="http://www.rsyslog.com/doc-status.html">rsyslog status page</a></i></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 want to lend us a helping hand. </b>It doesn't require a lot of diff --git a/doc/status.html b/doc/status.html deleted file mode 100644 index 6c183868..00000000 --- a/doc/status.html +++ /dev/null @@ -1,70 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html><head><title>rsyslog status page</title></head> -<body> -<h2>rsyslog status page</h2> -<p>This page reflects the status as of 2010-05-20.</p> -<h2>Current Releases</h2> - -<p><b>development:</b> 5.5.5 [2010-05-20] - -<a href="http://www.rsyslog.com/Article461.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-204.phtml">download</a> -<br> -<b>v4 development:</b> 4.7.2 [2010-05-03] - -<a href="http://www.rsyslog.com/Article457.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-202.phtml">download</a></p> - -<!-- not at the moment! -<p><b>beta:</b> 5.3.7 [2010-01-27] - -<a href="http://www.rsyslog.com/Article437.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-192.phtml">download</a></p> ---> - -<p><b>v5 stable:</b> 5.4.0 [2010-03-08] - -<a href="http://www.rsyslog.com/Article447.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-197.phtml">download</a> - -<br><b>v4 stable:</b> 4.6.2 [2010-03-26] - -<a href="http://www.rsyslog.com/Article449.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-198.phtml">download</a> - -<br><b>v3 stable:</b> 3.22.1 [2009-07-02] - -<a href="http://www.rsyslog.com/Article381.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-163.phtml">download</a> - -<br>v2 stable: 2.0.7 [2009-04-14] - <a href="http://www.rsyslog.com/Article362.phtml">change log</a> - -<a href="http://www.rsyslog.com/Downloads-req-viewdownloaddetails-lid-154.phtml">download</a> -<br>v0 to v2 are deprecated and no longer supported. If you absolutely do not like to -upgrade, you may consider purchasing a -<a href="professional_support.html">commercial rsyslog support package</a>. Just let us point -out that it is really not a good idea to still run a v0 version. - -<p><a href="v3compatibility.html">If you updgrade from version 2, be sure to read the rsyslog v3 -compatibility document.</a> There are no additional compatibility concerns at this time for -upgrading from v3 to v4. If some occur, we will post an additional compatiblity document.</p> -<p>(<a href="version_naming.html">How are versions named?</a>)</p> - -<h2>Platforms</h2> -<p>Thankfully, a number of folks have begin to build packages and -help port rsyslog to other platforms. As such, -<a href="http://wiki.rsyslog.com/index.php/Platforms">the -platform list is now maintained inside the rsyslog wiki</a>. -Platform maintainers perhaps have posted extra information there. If -you do platform-specific work, feel free to add information to the wiki.</p> -<p>Rsyslog is the default syslogd on almost all modern Linuxes. -It is also available under BSD and Sun Solaris.</p> -<h2>Additional information</h2> -<p><b>Currently supported features are listed on the <a href="features.html">rsyslog features page</a>.</b></p> -<ul> -<li>The rsyslog home page is <a href="http://www.rsyslog.com">www.rsyslog.com</a>.</li> -<li>Mailing list info can be found at <a href="http://lists.adiscon.net/mailman/listinfo/rsyslog">http://lists.adiscon.com/rsyslog</a>.</li> -<li>The change log can be found at <a href="http://www.rsyslog.com/Topic4.phtml"> -http://www.rsyslog.com/Topic4.phtml</a>. </li> -<li>Online documentation is available at <a href="http://www.rsyslog.com/doc">http://www.rsyslog.com/doc</a>.</li> -<li>You may also find <a href="http://rgerhards.blogspot.com/">Rainer's blog</a> -an interesting read.</li> -</ul> -<p>The project was initiated in 2003 and seriouosly begun in 2004 by -<a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> -and is currently being maintained by him. See the <a href="history.html">history page</a> for more -background information.</p> -</body></html> diff --git a/runtime/conf.c b/runtime/conf.c index 1d80c867..1f0badcb 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -1017,7 +1017,7 @@ static rsRetVal cflineProcessTagSelector(uchar **pline) if(**pline != '\0' && **pline == '*' && *(*pline+1) == '\0') { dbgprintf("resetting programname filter\n"); if(pDfltProgNameCmp != NULL) { - CHKiRet(rsCStrSetSzStr(pDfltProgNameCmp, NULL)); + rsCStrDestruct(&pDfltProgNameCmp); } } else { dbgprintf("setting programname filter to '%s'\n", *pline); diff --git a/tcps_sess.c b/tcps_sess.c index 1ae065fa..99af0cb8 100644 --- a/tcps_sess.c +++ b/tcps_sess.c @@ -239,6 +239,11 @@ defaultDoSubmitMessage(tcps_sess_t *pThis, struct syslogTime *stTime, time_t ttG ISOBJ_TYPE_assert(pThis, tcps_sess); + if(pThis->iMsg == 0) { + DBGPRINTF("discarding zero-sized message\n"); + FINALIZE; + } + if(pThis->DoSubmitMessage != NULL) { pThis->DoSubmitMessage(pThis, pThis->pMsg, pThis->iMsg); FINALIZE; @@ -477,8 +482,10 @@ DataRcvd(tcps_sess_t *pThis, char *pData, size_t iLen) CHKiRet(processDataRcvd(pThis, *pData++, &stTime, ttGenTime, &multiSub)); } - /* submit anything that was not yet submitted */ - CHKiRet(multiSubmitMsg(&multiSub)); + if(multiSub.nElem > 0) { + /* submit anything that was not yet submitted */ + CHKiRet(multiSubmitMsg(&multiSub)); + } finalize_it: RETiRet; |