diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:42:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:42:46 +0200 |
| commit | d6da57ae0370aeb705f63fd04e575b5ed4684618 (patch) | |
| tree | d451907714559f5df60eb0cdef6ccbc205c812e4 /tcps_sess.c | |
| parent | d8ce489bae3ae072a2ee605cd90fa0530c9f3446 (diff) | |
| parent | bd8d972a975ce794dd71c1c8db724991dd4744a0 (diff) | |
| download | rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.gz rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.tar.bz2 rsyslog-d6da57ae0370aeb705f63fd04e575b5ed4684618.zip | |
Merge branch 'v5-stable-newstats'
Conflicts:
action.c
configure.ac
doc/imuxsock.html
plugins/imklog/imklog.c
plugins/imptcp/imptcp.c
plugins/imtcp/imtcp.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
runtime/glbl.c
runtime/glbl.h
runtime/net.c
runtime/ruleset.c
tcpsrv.h
tools/syslogd.c
Diffstat (limited to 'tcps_sess.c')
| -rw-r--r-- | tcps_sess.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tcps_sess.c b/tcps_sess.c index bd461449..eb3740e4 100644 --- a/tcps_sess.c +++ b/tcps_sess.c @@ -200,6 +200,8 @@ SetLstnInfo(tcps_sess_t *pThis, tcpLstnPortList_t *pLstnInfo) ISOBJ_TYPE_assert(pThis, tcps_sess); assert(pLstnInfo != NULL); pThis->pLstnInfo = pLstnInfo; + /* set cached elements */ + pThis->bSuppOctetFram = pLstnInfo->bSuppOctetFram; RETiRet; } @@ -366,7 +368,7 @@ processDataRcvd(tcps_sess_t *pThis, char c, struct syslogTime *stTime, time_t tt ISOBJ_TYPE_assert(pThis, tcps_sess); if(pThis->inputState == eAtStrtFram) { - if(isdigit((int) c)) { + if(pThis->bSuppOctetFram && isdigit((int) c)) { pThis->inputState = eInOctetCnt; pThis->iOctetsRemain = 0; pThis->eFraming = TCP_FRAMING_OCTET_COUNTING; |