rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-18 00:30:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4-stable' into v5-stable

Browse Source 
Conflicts:
	tcpsrv.c
This commit is contained in:
Rainer Gerhards 2011-05-02 12:18:49 +02:00
commit 82818fe15c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -829,6 +829,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: a slightly more informative error message when a TCP
connections is aborted
- some improvements thanks to clang's static code analyzer
o overall cleanup (mostly unnecessary writes and otherwise unused stuff)
o bugfix: fixed a very remote problem in msg.c which could occur when

6
runtime/strmsrv.c
View File

@ -521,6 +521,7 @@ Run(strmsrv_t *pThis)
strms_sess_t *pNewSess;
nssel_t *pSel;
ssize_t iRcvd;
rsRetVal localRet;
ISOBJ_TYPE_assert(pThis, strmsrv);
@ -580,11 +581,12 @@ Run(strmsrv_t *pThis)
break;
case RS_RET_OK:
/* valid data received, process it! */
if(strms_sess.DataRcvd(pThis->pSessions[iSTRMSess], buf, iRcvd) != RS_RET_OK) {
localRet = strms_sess.DataRcvd(pThis->pSessions[iSTRMSess], buf, iRcvd);
if(localRet != RS_RET_OK) {
/* in this case, something went awfully wrong.
* We are instructed to terminate the session.
*/
errmsg.LogError(0, NO_ERRCODE, "Tearing down STRM Session %d - see "
errmsg.LogError(0, localRet, "Tearing down STRM Session %d - see "
"previous messages for reason(s)\n", iSTRMSess);
pThis->pOnErrClose(pThis->pSessions[iSTRMSess]);
strms_sess.Destruct(&pThis->pSessions[iSTRMSess]);