diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-12 11:48:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-12 11:48:09 +0200 |
| commit | 92a782dd2fc85c233f7144d86970321f2bfee588 (patch) | |
| tree | 06156dc4e1665a38cedf56d2c4fa4b4f2778b440 /tcps_sess.c | |
| parent | 12a433e000cab7ab1737df479aefbaeccab0dc09 (diff) | |
| parent | 9105946272e4190e042981f35994b3f044ebb0d3 (diff) | |
| download | rsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.tar.gz rsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.tar.xz rsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.zip | |
Merge branch 'v5-devel'
Conflicts:
configure.ac
doc/manual.html
plugins/imtcp/imtcp.c
Diffstat (limited to 'tcps_sess.c')
| -rw-r--r-- | tcps_sess.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tcps_sess.c b/tcps_sess.c index 8b944885..c64a9547 100644 --- a/tcps_sess.c +++ b/tcps_sess.c @@ -254,7 +254,8 @@ defaultDoSubmitMessage(tcps_sess_t *pThis, struct syslogTime *stTime, time_t ttG CHKiRet(msgConstructWithTime(&pMsg, stTime, ttGenTime)); MsgSetRawMsg(pMsg, (char*)pThis->pMsg, pThis->iMsg); MsgSetInputName(pMsg, pThis->pLstnInfo->pInputName); - MsgSetFlowControlType(pMsg, eFLOWCTL_LIGHT_DELAY); + MsgSetFlowControlType(pMsg, pThis->pSrv->bUseFlowControl + ? eFLOWCTL_LIGHT_DELAY : eFLOWCTL_NO_DELAY); pMsg->msgFlags = NEEDS_PARSING | PARSE_HOSTNAME; MsgSetRcvFrom(pMsg, pThis->fromHost); CHKiRet(MsgSetRcvFromIP(pMsg, pThis->fromHostIP)); |