diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-02 14:53:15 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-02 14:53:15 +0200 |
commit | 25045234c247a31bee3ba2891d7b81da822d9648 (patch) | |
tree | e26cfa9df0455799ee4d07e9f075b9081b7e39f1 | |
parent | 4b600b08a1160f09f35e58e6b5dae961f19e9f31 (diff) | |
parent | 466e0264015ba5ed100c120365c31a250105c0bb (diff) | |
download | rsyslog-25045234c247a31bee3ba2891d7b81da822d9648.tar.gz rsyslog-25045234c247a31bee3ba2891d7b81da822d9648.tar.xz rsyslog-25045234c247a31bee3ba2891d7b81da822d9648.zip |
Merge branch 'v5-stable'
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | tcpsrv.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -199,6 +199,8 @@ Version 5.8.1 [V5-stable] (rgerhards), 2011-04-?? - bugfix: IPv6-address could not be specified in omrelp this was due to improper parsing of ":" closes: http://bugzilla.adiscon.com/show_bug.cgi?id=250 +- bugfix: TCP connection invalidly aborted when messages needed to be + discarded (due to QUEUE_FULL or similar problem) - bugfix(minor): improper template function call in syslogd.c --------------------------------------------------------------------------- Version 5.8.0 [V5-stable] (rgerhards), 2011-04-12 @@ -1014,6 +1016,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 @@ -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. */ |