diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-02 12:34:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-02 12:34:46 +0200 |
| commit | 743a2ddf9f5bd4c9eca521d45c184788c93b4ce8 (patch) | |
| tree | 65f6a23e91005a28743ed17c5f75522b8f59695f /tcps_sess.c | |
| parent | c8ac47b5895526b524551c9810ad39f086ee76ca (diff) | |
| parent | 7acbde62c53792ab9a9c1317ec197fe4446941e6 (diff) | |
| download | rsyslog-743a2ddf9f5bd4c9eca521d45c184788c93b4ce8.tar.gz rsyslog-743a2ddf9f5bd4c9eca521d45c184788c93b4ce8.tar.bz2 rsyslog-743a2ddf9f5bd4c9eca521d45c184788c93b4ce8.zip | |
Merge branch 'c9'
Conflicts:
runtime/msg.c
Diffstat (limited to 'tcps_sess.c')
| -rw-r--r-- | tcps_sess.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tcps_sess.c b/tcps_sess.c index 5821e443..96bb6a4b 100644 --- a/tcps_sess.c +++ b/tcps_sess.c @@ -253,6 +253,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); + if(pThis->pLstnInfo->dfltTZ != NULL) + MsgSetDfltTZ(pMsg, (char*) pThis->pLstnInfo->dfltTZ); MsgSetFlowControlType(pMsg, pThis->pSrv->bUseFlowControl ? eFLOWCTL_LIGHT_DELAY : eFLOWCTL_NO_DELAY); pMsg->msgFlags = NEEDS_PARSING | PARSE_HOSTNAME; |