From 921bebc8ee203c0569332c636515c4de036dfcf9 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 2 May 2011 12:43:58 +0200 Subject: bugfix: TCP connection invalidly aborted when messages needed to be discarded due to QUEUE_FULL or similar problem --- ChangeLog | 2 ++ tcpsrv.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6adcc29e..16928921 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,8 @@ Version 4.6.6 [v4-stable] (rgerhards), 2010-11-?? bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=221 - bugfix: omlibdbi did not use password from rsyslog.con closes: http://bugzilla.adiscon.com/show_bug.cgi?id=203 +- bugfix: TCP connection invalidly aborted when messages needed to be + discarded (due to QUEUE_FULL or similar problem) - bugfix: a slightly more informative error message when a TCP connections is aborted - some improvements thanks to clang's static code analyzer diff --git a/tcpsrv.c b/tcpsrv.c index 5de805b2..0581828e 100644 --- a/tcpsrv.c +++ b/tcpsrv.c @@ -547,7 +547,7 @@ Run(tcpsrv_t *pThis) case RS_RET_OK: /* valid data received, process it! */ localRet = tcps_sess.DataRcvd(pThis->pSessions[iTCPSess], buf, iRcvd); - if(localRet != RS_RET_OK) { + if(localRet != RS_RET_OK && localRet != RS_RET_QUEUE_FULL) { /* in this case, something went awfully wrong. * We are instructed to terminate the session. */ -- cgit