Merge branch 'v4-stable' into v4-devel

Conflicts:
	tcpsrv.c
	tests/Makefile.am
	tests/tcpflood.c

1 files changed, 1 insertions, 1 deletions

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.
 						 */