diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-28 11:45:09 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-28 11:45:09 +0100 |
commit | f7d79b8de13d4fac2de49ad52ba30578b7282e57 (patch) | |
tree | 45301cfab3c6897bccbd7b7fe3f45d731b892044 | |
parent | 6106c05fcfbb8fe744108e4c3a66948b66f560f8 (diff) | |
download | rsyslog-f7d79b8de13d4fac2de49ad52ba30578b7282e57.tar.gz rsyslog-f7d79b8de13d4fac2de49ad52ba30578b7282e57.tar.bz2 rsyslog-f7d79b8de13d4fac2de49ad52ba30578b7282e57.zip |
bugfix: imtcp flowControl parameter incorrectly defaulted to "off"
This could cause message loss on systems under heavy load and was
a change-of-behaviour to previous version. This is a regression
most probably introduced in 5.9.0 (but did not try hard to find the
exact point of its introduction).
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | plugins/imtcp/imtcp.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,5 +1,10 @@ --------------------------------------------------------------------------- Version 7.4.6 [v7.4-stable] 2013-11-?? +- bugfix: imtcp flowControl parameter incorrectly defaulted to "off" + This could cause message loss on systems under heavy load and was + a change-of-behaviour to previous version. This is a regression + most probably introduced in 5.9.0 (but did not try hard to find the + exact point of its introduction). - now requires libestr 0.1.9 as earlier versions lead to problems with number handling in RainerScript - bugfix: memory leak in strlen() RainerScript function diff --git a/plugins/imtcp/imtcp.c b/plugins/imtcp/imtcp.c index d2a0e565..e10a8ba3 100644 --- a/plugins/imtcp/imtcp.c +++ b/plugins/imtcp/imtcp.c @@ -408,7 +408,7 @@ CODESTARTbeginCnfLoad loadModConf->iTCPLstnMax = 20; loadModConf->bSuppOctetFram = 1; loadModConf->iStrmDrvrMode = 0; - loadModConf->bUseFlowControl = 0; + loadModConf->bUseFlowControl = 1; loadModConf->bKeepAlive = 0; loadModConf->bEmitMsgOnClose = 0; loadModConf->iAddtlFrameDelim = TCPSRV_NO_ADDTL_DELIMITER; @@ -631,7 +631,7 @@ resetConfigVariables(uchar __attribute__((unused)) *pp, void __attribute__((unus cs.iTCPLstnMax = 20; cs.bSuppOctetFram = 1; cs.iStrmDrvrMode = 0; - cs.bUseFlowControl = 0; + cs.bUseFlowControl = 1; cs.bKeepAlive = 0; cs.bEmitMsgOnClose = 0; cs.iAddtlFrameDelim = TCPSRV_NO_ADDTL_DELIMITER; |