summaryrefslogtreecommitdiffstats
path: root/tcpsrv.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-05-02 14:53:15 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-05-02 14:53:15 +0200
commit25045234c247a31bee3ba2891d7b81da822d9648 (patch)
treee26cfa9df0455799ee4d07e9f075b9081b7e39f1 /tcpsrv.c
parent4b600b08a1160f09f35e58e6b5dae961f19e9f31 (diff)
parent466e0264015ba5ed100c120365c31a250105c0bb (diff)
downloadrsyslog-25045234c247a31bee3ba2891d7b81da822d9648.tar.gz
rsyslog-25045234c247a31bee3ba2891d7b81da822d9648.tar.xz
rsyslog-25045234c247a31bee3ba2891d7b81da822d9648.zip
Merge branch 'v5-stable'
Diffstat (limited to 'tcpsrv.c')
-rw-r--r--tcpsrv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/tcpsrv.c b/tcpsrv.c
index 938bbf7a..80c29387 100644
--- a/tcpsrv.c
+++ b/tcpsrv.c
@@ -537,7 +537,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.
*/