diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-19 18:04:13 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-19 18:04:13 +0200 |
| commit | fb5cd633e6f4852841354fcf55c971063cc6a871 (patch) | |
| tree | 4dbab68245bf3e41dd863c319aeaf64799d2d2bc | |
| parent | be5d462673e70afbe509e10c59b81ca7b86135ac (diff) | |
| parent | 2ad747cab7451e15178f252a86ff7835a59d3910 (diff) | |
| download | rsyslog-fb5cd633e6f4852841354fcf55c971063cc6a871.tar.gz rsyslog-fb5cd633e6f4852841354fcf55c971063cc6a871.tar.xz rsyslog-fb5cd633e6f4852841354fcf55c971063cc6a871.zip | |
Merge branch 'v5-stable-newstats' into v5-beta
Conflicts:
ChangeLog
configure.ac
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | plugins/imptcp/imptcp.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -8,6 +8,8 @@ Version 5.9.6 [V5-BETA], 2012-04-12 his help in testing the fix. - bugfix: imklog invalidly computed facility and severity closes: http://bugzilla.adiscon.com/show_bug.cgi?id=313 +- bugfix: imptcp input name could not be set + config directive was accepted, but had no effect - added configuration directive to disable octet-counted framing for imtcp, directive is $InputTCPServerSupportOctetCountedFraming for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming @@ -130,6 +132,8 @@ Version 5.9.0 [V5-DEVEL] (rgerhards), 2011-06-08 closes: http://bugzilla.adiscon.com/show_bug.cgi?id=236 --------------------------------------------------------------------------- Version 5.8.11 [V5-stable] 2012-04-?? +- bugfix: imptcp input name could not be set + config directive was accepted, but had no effect - bugfix: assigned ruleset was lost when using disk queues This looked quite hard to diagnose for disk-assisted queues, as the pure memory part worked well, but ruleset info was lost for messages diff --git a/plugins/imptcp/imptcp.c b/plugins/imptcp/imptcp.c index b5dcf0e7..008f7920 100644 --- a/plugins/imptcp/imptcp.c +++ b/plugins/imptcp/imptcp.c @@ -1003,14 +1003,14 @@ static rsRetVal addTCPListener(void __attribute__((unused)) *pVal, uchar *pNewVa pSrv->bEmitMsgOnClose = cs.bEmitMsgOnClose; pSrv->port = pNewVal; pSrv->iAddtlFrameDelim = cs.iAddtlFrameDelim; - cs.pszInputName = NULL; /* moved over to pSrv, we do not own */ pSrv->lstnIP = cs.lstnIP; - cs.lstnIP = NULL; /* moved over to pSrv, we do not own */ pSrv->pRuleset = cs.pRuleset; pSrv->pszInputName = (cs.pszInputName == NULL) ? UCHAR_CONSTANT("imptcp") : cs.pszInputName; CHKiRet(prop.Construct(&pSrv->pInputName)); CHKiRet(prop.SetString(pSrv->pInputName, pSrv->pszInputName, ustrlen(pSrv->pszInputName))); CHKiRet(prop.ConstructFinalize(pSrv->pInputName)); + cs.pszInputName = NULL; /* moved over to pSrv, we do not own */ + cs.lstnIP = NULL; /* moved over to pSrv, we do not own */ /* add to linked list */ pSrv->pNext = pSrvRoot; |