diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-03 12:29:03 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-03 12:29:03 +0200 |
| commit | 9430aa0d3a982d7759bb5d7db1be9b64064550ec (patch) | |
| tree | a85e4173149435735ab0da8e186b58ad5d914c52 /tcpsrv.c | |
| parent | 1bfaf4ac06e82c0e4008a2b851043a09aee1a2e3 (diff) | |
| parent | ec7501e7956f356d1e79a062340c244e67d5ef24 (diff) | |
| download | rsyslog-9430aa0d3a982d7759bb5d7db1be9b64064550ec.tar.gz rsyslog-9430aa0d3a982d7759bb5d7db1be9b64064550ec.tar.bz2 rsyslog-9430aa0d3a982d7759bb5d7db1be9b64064550ec.zip | |
Merge branch 'v5-stable' into v5-devel
Diffstat (limited to 'tcpsrv.c')
| -rw-r--r-- | tcpsrv.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -518,7 +518,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. */ |