diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:07:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-09 15:07:22 +0200 |
| commit | fd4a54698cee48da073622f7d6ac49c94ccb1808 (patch) | |
| tree | b16110018cd3a21a19561f45376403e1e8815cfb /tcpsrv.c | |
| parent | 88ff647aef4c6db3c444c6d080f9886350ca9584 (diff) | |
| parent | 87a01476e2a63ab7b6740b6b4182281d271ef382 (diff) | |
| download | rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.tar.gz rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.tar.xz rsyslog-fd4a54698cee48da073622f7d6ac49c94ccb1808.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
tools/omfwd.c
Diffstat (limited to 'tcpsrv.c')
| -rw-r--r-- | tcpsrv.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -539,7 +539,8 @@ doReceive(tcpsrv_t *pThis, tcps_sess_t **ppSess, nspoll_t *pPoll) break; case RS_RET_OK: /* valid data received, process it! */ - if((localRet = tcps_sess.DataRcvd(*ppSess, buf, iRcvd)) != RS_RET_OK) { + localRet = tcps_sess.DataRcvd(*ppSess, buf, iRcvd); + if(localRet != RS_RET_OK && localRet != RS_RET_QUEUE_FULL) { /* in this case, something went awfully wrong. * We are instructed to terminate the session. */ |